From nobody Tue Nov 18 01:24:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.68 as permitted sender) client-ip=209.85.218.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607381025; cv=none; d=zohomail.com; s=zohoarc; b=QNEOglla/yx3ob2LJpvIlKwo/L3kPzEpUX4lyE8RFYfU1ApHMfBbq3Iyy3erOJjzgHRomyW+7ZfQClRtf3+PE8HyFBTMLKU9zvVrlvvH0F7elxtvCuJJVI1g47Tzg0Oune7j34YfPlNEyDBfDRY+hsZknvrC1TtRXSG+fjnf4EI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607381025; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zSlFyG+azHlf1O1jZlNYMT5Vr3wLituVoG139gBOWj0=; b=Qy7xFz4o8K5bGiDCCGgR5qkv8iiFlrqx+eHdIRH9/H76HDwtVXFLzsp0t5hEIN9EMaN1gFsc1KpYrJ9dnH0KCuW3UU0RKRFt6De0Jsmb0uYtlTHN4rRxQZdBrdTwH/w0MpDopiC6dveeqYDvo3uCzL2tRef9E3sYe+KtR8mNW3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by mx.zohomail.com with SMTPS id 1607381025405346.89169013440346; Mon, 7 Dec 2020 14:43:45 -0800 (PST) Received: by mail-ej1-f68.google.com with SMTP id jx16so21834365ejb.10 for ; Mon, 07 Dec 2020 14:43:44 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id qh23sm12920956ejb.71.2020.12.07.14.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 14:43:42 -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=oMrXzCMidZc248nX2yK3SmiVrEf6cZ6xNdkoOkqcLkn2QDwAoKVGGT+XPqGqU6G+vJ LyQuubtFxpUW4NmZq8BF6d+AfkEyQ+/hj+ymVn4IUkVPwt757f2A0vsnFYeqTDJNrd91 Xs+nGEUJP3UxjvRPnD6OwO2oJBfjIvc3rwsErWe20tLJAXHIldHWY0TcQSq6aJfHZta8 4S/8LyqgUlZ30J2a91meuLx/cCYcNA9BWYugb2FIiXhbPaxmMqEbxlcLB/kXbSHskX1E RMc44eKgDz9D3qLvl7apff3YUbnBT7QoeCTV3hOEXK8VdannhnPekpHYWi3umYgLuvw3 c+8Q== 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=nfY1og1EMkUDtR/mKjB2vP7lBNdVvks0C0RUwpPR8C1eavrRmFEJxK1zK7QVHnJwW8 9EC/6tGq/xd/iG/QOKwE0KaBSveEQ/wHjX1hcT3w/fVL+yOVKwCQS6wrOpCtXuZPD83G A5emsAyM1beLEKnBuN9ey/IF9FKOqsn6NezO/8xfRxu7SqyHtpnhRUwVTTAUqw/VcLNF m/I9JKXcX5+CeD1noMdfJEs8QBWzXOdEW6B3r/yTSbNlCvwF1/TcSJDD6LIWUPIxt46x L210jWcGkVcfOhs6HVDgfbxXooa86jfSN+++76yURqxPifCbKf/YyvHR4lhZWjsXm/EC 5/Yw== X-Gm-Message-State: AOAM533hAZ6h/8U4NzOmQJUfEfxg6RvVVJ4m0Jfdy8Q7krjczJNYtuJC g1UPBo/f/VInFNmbUTszNs8= X-Google-Smtp-Source: ABdhPJxSH+39VwfK4NBSQyKyFosabDqGC4gqyutZXzEXHLPJnR1rc77d51lTK7tBDxlLB/b1kVLOUA== X-Received: by 2002:a17:906:e082:: with SMTP id gh2mr20032295ejb.406.1607381023593; Mon, 07 Dec 2020 14:43:43 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Richard Henderson Subject: [PATCH v4 1/6] linux-user/elfload: Move GET_FEATURE macro out of get_elf_hwcap() body Date: Mon, 7 Dec 2020 23:43:30 +0100 Message-Id: <20201207224335.4030582-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201207224335.4030582-1-f4bug@amsat.org> References: <20201207224335.4030582-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) As we are going to add more macros, keep the function body clear. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 { =20 #define ELF_HWCAP get_elf_hwcap() =20 +#define GET_FEATURE(_flag, _hwcap) \ + do { if (cpu->env.insn_flags & (_flag)) { hwcaps |=3D _hwcap; } } whil= e (0) + static uint32_t get_elf_hwcap(void) { MIPSCPU *cpu =3D MIPS_CPU(thread_cpu); uint32_t hwcaps =3D 0; =20 -#define GET_FEATURE(flag, hwcap) \ - do { if (cpu->env.insn_flags & (flag)) { hwcaps |=3D hwcap; } } while = (0) - GET_FEATURE(ISA_MIPS32R6 | ISA_MIPS64R6, HWCAP_MIPS_R6); GET_FEATURE(ASE_MSA, HWCAP_MIPS_MSA); =20 -#undef GET_FEATURE - return hwcaps; } =20 +#undef GET_FEATURE + #endif /* TARGET_MIPS */ =20 #ifdef TARGET_MICROBLAZE --=20 2.26.2 From nobody Tue Nov 18 01:24:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.65 as permitted sender) client-ip=209.85.218.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.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=1607381030; cv=none; d=zohomail.com; s=zohoarc; b=BCVdzE+XtFAF+0Sb6mQCXymnHSwLWM8MuwatJ3Nprus1zZhdRGKgeqWLGwzok/DPWWQ7FQ3vvjZIIFLbAlOmIRs1bghFBxtmFdVM+w9k2pu1CPgewFI26jN2g/RcFBLAaGGybMaihrOAE/f2pM4qhv1AU7t8QhlN5THkoISa+eY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607381030; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uPRexVPkDjCG4AyHRPKefAxhlHzd9mlDS2Ak1Dn5wzA=; b=ZgzVH1hFxvuIi67cAgr1MVpcKNcN4L7QwnW7k2we7jtCamIP3UutYVTY2R/3lGzq43at1iWbl9P1jUFy9Qy3kQO0hHfE+U2Mjaar4zXtdxFrczdpXkh7+0nw2za/u64VRqTOM5el2Q+AM+I6JtawILd5clZu2lik/4C5WiqV0hk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by mx.zohomail.com with SMTPS id 1607381030715206.14703372639121; Mon, 7 Dec 2020 14:43:50 -0800 (PST) Received: by mail-ej1-f65.google.com with SMTP id d17so21851630ejy.9 for ; Mon, 07 Dec 2020 14:43:50 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id q26sm13974954ejt.73.2020.12.07.14.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 14:43:48 -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=uPRexVPkDjCG4AyHRPKefAxhlHzd9mlDS2Ak1Dn5wzA=; b=d+ZXHw46JlTEA4ZCC/GBW0kDvusDyWvC0qftMX6AI7oL2uEAbQBqzwZkMtJyE3cIdE itK22waRtH4usMHqSpemvlvBljKHrM9ITALC7DZTXzg+gipCy+hWwAa4S67Rcbskaktm LNZk1HQL543DZKTDyio9O1c49FKSiezAlkY1vGNHoYvzQgQtM2OYAsJk3jllS3TgCb7h vI4lVqW+b4GPL9xL2OEdKkoGMEW8pgfA3NBx7LW6fvUbso+Z50Zczs38URkO71FGDkBq oJKJL9aSH/4ifFe2ESby2db6WVbyN6qDKJO6yBwbWdi7FaBJitbQzzPiDWoD7YtWxRq+ BMMA== 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=uPRexVPkDjCG4AyHRPKefAxhlHzd9mlDS2Ak1Dn5wzA=; b=WYPEX9MEV3KgiGGTwbkIPjZDQEJsdqOa8RY+BvpDqjxXCxnPziBuXNgFJ1ctZKxRe9 Fr3q9bAfOUmHzuGvUZLuOnNG/7LwdNWHB6UMTB2JoELdhJMi0cE7v4AETff2lnczH90O bzK0iLCWsjkt5KDyv3JxJvWfJrcohpVBETCm7Os5YjDWDRAHiWRJj2iz4ZEI0UM+rl08 M71JoDHFHOr6RgjJ7xsf6lJEZUHp4r2fHw025uxOt2Kpbz1P3tmnfSLDV47zufh3Vh3/ hl06K+xqa8u0nsBjNlG8uxzgnjRf9EcMDbWG2foWpBB9nldyGIm3lmGYmdwhVAGxyS+9 Ui9A== X-Gm-Message-State: AOAM5336HxsNxO5aI5/3h8X0Mxwr9T97wNru/AFjiTN2j6hcV7nxgLPr ZjJHQBFCRUsx/p+6L19bBpk= X-Google-Smtp-Source: ABdhPJzBex17XWkFZiyL70bBdPoH2yGs6L6SMZL6F69z2At/PaaImT0i8xTT3qABDAPupWhsGafWJw== X-Received: by 2002:a17:906:55d0:: with SMTP id z16mr20620124ejp.466.1607381028892; Mon, 07 Dec 2020 14:43:48 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Richard Henderson Subject: [PATCH v4 2/6] linux-user/elfload: Rename MIPS GET_FEATURE() as GET_FEATURE_INSN() Date: Mon, 7 Dec 2020 23:43:31 +0100 Message-Id: <20201207224335.4030582-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201207224335.4030582-1-f4bug@amsat.org> References: <20201207224335.4030582-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) We want to add macros similar to GET_FEATURE(). As this one use the 'insn_flags' field, rename it GET_FEATURE_INSN(). Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/elfload.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index aae28fd929d..0e1d7e7677c 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -989,7 +989,7 @@ enum { =20 #define ELF_HWCAP get_elf_hwcap() =20 -#define GET_FEATURE(_flag, _hwcap) \ +#define GET_FEATURE_INSN(_flag, _hwcap) \ do { if (cpu->env.insn_flags & (_flag)) { hwcaps |=3D _hwcap; } } whil= e (0) =20 static uint32_t get_elf_hwcap(void) @@ -997,13 +997,13 @@ static uint32_t get_elf_hwcap(void) MIPSCPU *cpu =3D MIPS_CPU(thread_cpu); uint32_t hwcaps =3D 0; =20 - GET_FEATURE(ISA_MIPS32R6 | ISA_MIPS64R6, HWCAP_MIPS_R6); - GET_FEATURE(ASE_MSA, HWCAP_MIPS_MSA); + GET_FEATURE_INSN(ISA_MIPS32R6 | ISA_MIPS64R6, HWCAP_MIPS_R6); + GET_FEATURE_INSN(ASE_MSA, HWCAP_MIPS_MSA); =20 return hwcaps; } =20 -#undef GET_FEATURE +#undef GET_FEATURE_INSN =20 #endif /* TARGET_MIPS */ =20 --=20 2.26.2 From nobody Tue Nov 18 01:24:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.65 as permitted sender) client-ip=209.85.218.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607381036; cv=none; d=zohomail.com; s=zohoarc; b=iLGEO9X3wWhySvIJgF/oAMzkwWWpBg7gUlyuR54PZlnJ31p3Po+ZzewvA5rLEqNlWNMvLhWko/Y+lZYtAj1O1tJ7DVoVJaX+emOnxDzmroKVy1sf1NBQMVbW8/PQDFgHZy+1jMnt9zCfyg3gyc21RFeEfjLWJAM/+BUxF36uXXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607381036; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7+gpz5nBbN/ysI0JfpfLjTz+oao1gnIR+w+URSQBzdk=; b=cFEPl2JiNdtkXtpadln0oYWtLjHBMROYv4wkQUdiMJlejfe1WATEBXUT+hDenmSQCYrYdTDlaWIlUjQToIWmKu3H/uHFqFg38krSQRt8NqYixU7TuTnrrV3w5jsmzolB0ZPpWGj9Z9Y2fIc99fVEHYM+RqlWsxT/es9Fu1ZdrJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by mx.zohomail.com with SMTPS id 1607381036918289.94677607423364; Mon, 7 Dec 2020 14:43:56 -0800 (PST) Received: by mail-ej1-f65.google.com with SMTP id m19so21819734ejj.11 for ; Mon, 07 Dec 2020 14:43:55 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id d6sm13679046ejy.114.2020.12.07.14.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 14:43:53 -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=7+gpz5nBbN/ysI0JfpfLjTz+oao1gnIR+w+URSQBzdk=; b=Cd4kKXgh9x7YLjGpu/9bBPDEkaKfzGTSYOEIyrUdYLRKcQG//reFMCmA4w6s4YFwHq n+5B2YJuKA2vy2F6/wvyMn49obDSpPyp/syPj1dH6JLo33QIJBim7nSm2Lk4pu8lh6Qg pRKE+/w73GnIlmSM4AZto3lHYmIaJZhDfVEjw+umtkRrt+XoGIjZQHTNpohvonAxJv3f SALADJlc5tJghIvjdxQKD/tHhE2XG0GNxNC0D3KVpJsYxCCP0CtJIvtF2tIVVCOSDG8O BW2UyTlYMpY7ckWw23RDs4KE0xYq2PhWKbBAmgTwh982xAdxTliM+sIyLybHNyj8+n/I pk9Q== 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=7+gpz5nBbN/ysI0JfpfLjTz+oao1gnIR+w+URSQBzdk=; b=lR7edUNqw1/kYdNyuMPchFw/Z/wzZON/QT6TO+Xm9V6Fxette8a3PeT07QdF9sfDZs golT4voD0w4ZHwW9oPVvcaqiCoW6bWj8cVqoWm7UT7UMy8u6HvrhQxKLu5amBMKVD/xI DEO4Gtj3E+fVWwNbeUqD0i+rlB/eV8CPtEJI99RwNjM2KhbswUCsh2E5AayrZmf8EE/h dmlOBmPTwp3EGsa7OQkCoAp8wzvnm40BZEv6gIR28mDmpyDB/EgYUq4qVusKr818zBa1 WOGtKPnmr7bxe9t/Y1TZZ7Lw2uKjmllhTb22BTmV6DNPKISqSCB/TFotPlP9jW9eir94 ZzXQ== X-Gm-Message-State: AOAM530GRzMU/BP7+lDMZ+X/JZw7z7WHqasDVoJ8FieAM+FTaZEdfJIo ptyo/Ie93d2oxtIqWt7z6mU= X-Google-Smtp-Source: ABdhPJwDnOwEQcKLlx3X511x8QX5swe8td66qSwvcprh+DBZLCTi8yfn0fl5B/1j9b1WBqXS2cc0yA== X-Received: by 2002:a17:906:4016:: with SMTP id v22mr21385100ejj.266.1607381034137; Mon, 07 Dec 2020 14:43:54 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Richard Henderson Subject: [PATCH v4 3/6] linux-user/elfload: Introduce MIPS GET_FEATURE_REG_SET() macro Date: Mon, 7 Dec 2020 23:43:32 +0100 Message-Id: <20201207224335.4030582-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201207224335.4030582-1-f4bug@amsat.org> References: <20201207224335.4030582-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_SET() macro which checks if a CPU register has bits set. Use the macro to check for MSA (which sets the MSAP bit of the Config3 register when the ASE implementation is present). Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/elfload.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 0e1d7e7677c..b7c6d30723a 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -992,17 +992,21 @@ enum { #define GET_FEATURE_INSN(_flag, _hwcap) \ do { if (cpu->env.insn_flags & (_flag)) { hwcaps |=3D _hwcap; } } whil= e (0) =20 +#define GET_FEATURE_REG_SET(_reg, _mask, _hwcap) \ + do { if (cpu->env._reg & (_mask)) { 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_INSN(ASE_MSA, HWCAP_MIPS_MSA); + GET_FEATURE_REG_SET(CP0_Config3, 1 << CP0C3_MSAP, HWCAP_MIPS_MSA); =20 return hwcaps; } =20 +#undef GET_FEATURE_REG_SET #undef GET_FEATURE_INSN =20 #endif /* TARGET_MIPS */ --=20 2.26.2 From nobody Tue Nov 18 01:24:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.68 as permitted sender) client-ip=209.85.208.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.68 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=1607381041; cv=none; d=zohomail.com; s=zohoarc; b=jvCCqp0OXqkjM+i3sUCxL0M6e68G3Tk27JFGm4gJdeFppDgbUd2QbyxRvucobv6iZ2zAerFvQpoLrH0ysqQX8WNU85MLqmD4wynZvF4EFr8VN2jrjjNVmD4zeGcJ2fhyyojXSqLAzzzhqtIoaSSblr6hV2DkYReNy5EUayCHV6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607381041; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tiLrE9BtsdFPhNtY2DXHquXLU9v+7Ir7R7907jubF5Q=; b=U2rItcp4Sn5wAEWTr4/qz9RI0BS+qf0uL8grs7mdezQ7JVvTyt/08BYAsALxjUR+U5AxLsxzWUrctg7UzBEejRvKWRvWLss3i66wiHiiemccXwToioHhfFXl+81ds1RfhDFyJ6JSPgmjWzYabDTMb0/p2LmYUrEWxFLdv9iedV8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by mx.zohomail.com with SMTPS id 1607381041105731.289757492309; Mon, 7 Dec 2020 14:44:01 -0800 (PST) Received: by mail-ed1-f68.google.com with SMTP id i24so7680959edj.8 for ; Mon, 07 Dec 2020 14:44:00 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id i26sm5515613eja.23.2020.12.07.14.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 14:43:58 -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=tiLrE9BtsdFPhNtY2DXHquXLU9v+7Ir7R7907jubF5Q=; b=IajCAjRN/jprrEGLfFvDqV5o6cm8o+06y0erRBPFmpQfqxVdoYiGhN4xMB9PF/ySx9 Mhw9IUCxf6qZ4yeZ3tgJUeBZ3COO5HGu2MFCI9cRWzerKEUDRQoBk9PdnK9+gBkJ2Hy0 pppaZHlzjYlbWaE8TXBwUvtIoeD3f8iUsf/pNKwLEWQag3id1DPGLw02XNjxTZJTJmht fcunrfWgwRTxBnmT+VuzB2dR9UiXdXQXVCg8IFz/a0uWWuVOEgi14zdrqIoRuhNLVeNO 2+uATZK7qhkwMZwFOevrTpOhGloy7wwnbCYuZMeXPNyhldsAIhfS7qDlWEAxEGDsHTdB NnPQ== 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=tiLrE9BtsdFPhNtY2DXHquXLU9v+7Ir7R7907jubF5Q=; b=PRMvlEXoLe5NUoekN4XF/gMe0UnAjfNLJUToYsm2pEwoeyh+/kzHo3t+L99/C4/kSy o9l/AHhgRsQfcvDV08mo+UvF03HnqIDINrf307zJRc01gfRAI7bgTTwtbsTlfuKgPJV1 jbGetIhY/U3Qj9Chq3CVhezpyy6cEwMEiGnYfUFyOdfveTBxqDwM6ND3soFzqVwKo/06 zVXQjou/GhonoA/k2Q3exnZq7xwvcq7qjgBmdNVdL/9PNky38Or4UpX/bhUv3AqhA5Xk NKGyk2YlNokmospoHHyccclcrWKftLo9Q6eRxHEsDb4ECXowCQ6qY9cbqsS/njGvopVm yodQ== X-Gm-Message-State: AOAM530zzd2OiiQh2hgJT/aX5OmVe3leiDqNpjGofI3VD+hjiLXA5d/s TLpsFg2vqBAPkn/rBQ4H7DVV5k7soG0= X-Google-Smtp-Source: ABdhPJxbbper1U3Iq6tiWqLjM7IKdsW0rn1V1BWe4MMLSx5A1v38VSmc0TGSdivsjHX7a4HRkvEiBA== X-Received: by 2002:a50:8a44:: with SMTP id i62mr19173995edi.97.1607381039368; Mon, 07 Dec 2020 14:43:59 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Richard Henderson Subject: [PATCH v4 4/6] linux-user/elfload: Introduce MIPS GET_FEATURE_REG_EQU() macro Date: Mon, 7 Dec 2020 23:43:33 +0100 Message-Id: <20201207224335.4030582-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201207224335.4030582-1-f4bug@amsat.org> References: <20201207224335.4030582-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. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cpu.h | 1 + linux-user/elfload.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 23f8c6f96cd..2639b0ea06c 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -844,6 +844,7 @@ struct CPUMIPSState { #define CP0C0_MT 7 /* 9..7 */ #define CP0C0_VI 3 #define CP0C0_K0 0 /* 2..0 */ +#define CP0C0_AR_LENGTH 3 int32_t CP0_Config1; #define CP0C1_M 31 #define CP0C1_MMU 25 /* 30..25 */ diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b7c6d30723a..8f943f93ba7 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -7,6 +7,7 @@ =20 #include "qemu.h" #include "disas/disas.h" +#include "qemu/bitops.h" #include "qemu/path.h" #include "qemu/queue.h" #include "qemu/guest-random.h" @@ -995,17 +996,26 @@ 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, _start, _length, _val, _hwcap) \ + do { \ + if (extract32(cpu->env._reg, (_start), (_length)) =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, CP0C0_AR, CP0C0_AR_LENGTH, + 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 From nobody Tue Nov 18 01:24:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.68 as permitted sender) client-ip=209.85.208.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607381046; cv=none; d=zohomail.com; s=zohoarc; b=IUnAaI9GA0Q+Wm8o5d6cVKssj6bc/P5D5RwK4ZQCd1yKdn4K/kdQ+dVTPxFNNEBD9kYO06omHPtYU6G7H6fYeqys+OOJA1YeR4QUgYEMkjIMRLj/piYo7Cgswh87ki06vXIxNRFTsZwYBzShnBQTBwvQCX8SJzK27HB4LZbb3Pc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607381046; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PsgapN4DayY67PGB6PO85RVxsavx9TC/Jgo4bJ+1BLQ=; b=KhIPikTC4arSXTjz9tRxqhdrmHEvnS8X99fGSKj3sOqT5bZ8Em69xXodu7juJySJWRIrg0cl0O9CvbDXoAEK+GU2rIRUOTIYfNbWokfju9nA9VlQwvrVWBolbR72ZMS+5t44g1N2gQsFYzsiVGrbPMMmfv5rLAtBWhIA692KNnI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by mx.zohomail.com with SMTPS id 1607381046467907.6085904475148; Mon, 7 Dec 2020 14:44:06 -0800 (PST) Received: by mail-ed1-f68.google.com with SMTP id p22so3491672edu.11 for ; Mon, 07 Dec 2020 14:44:05 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id gn21sm8231238ejc.27.2020.12.07.14.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 14:44:03 -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=PsgapN4DayY67PGB6PO85RVxsavx9TC/Jgo4bJ+1BLQ=; b=I/CfST2viOffPmkuqmHYjl10aHRZ8hjw9+EudTwLVOPPFgJDm3R7uy64guys5rHt8Q UHcKT3VBKaksntFZJmPzU94WQqEBZgTLvA2xLxsA682qfClACCfPRs+//9lIy+rDNS3q TOYa1L716scB4RbG8NKTLXKf1/zlFji5qFddwzQ+Ah+7hz74eHGLVGCxhFwJQWWvB0sb cVeIlTSFRSPIZQ3uVih5iABx7IEOtDtAzKNF5ZRVajXZfooLSnv1a6QzfTc13EpKbsWD D77Q3wBa3O5ya2+LJymveG5zh0zQq6ImY2xQ+wMnvr8WMx1vbOzC8vQHqAMtTejaX8av +jrw== 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=PsgapN4DayY67PGB6PO85RVxsavx9TC/Jgo4bJ+1BLQ=; b=DHSIq20fQw7YOFXaztWHgSXLbTCRy3FA1JqsPZpsQSVVmr7EuKm2YXMzDS5ERQ3YBN +10Y+oP2MaLdOd8H+QDnAKt5jGZBLyjlXyH8cNoL3PYuKerVLEPgmB+b6wd45L97AL+j zRBjW05/BsIYXZU+6pJhTTnypJiTjtGD+3GUmXsZBryrYqGt/INBCVUiurgDBeVW7PV7 GAVEUnry13mrdZ8khmkrhDquy0oky1qrQjt/3ZWXSSvLf0vlT8w97dogS/VeRB4iUEn6 c3Ke5ZMwHEaise2egJSPSirPszV9aSJf+9QNs8QhjNbajnV2PozUChvz5XBtFYjDBwn5 eM4w== X-Gm-Message-State: AOAM5329T++xGHLFKitaKw/+iFvRe9lmeEOdsTA4OB/L87R3j+JfT68H z+eyjtz3Jw6L6UR9Y+J597s= X-Google-Smtp-Source: ABdhPJxJtFeBVcCwDyOA3XcfF0Y091gEd+Wo3TWdiiKDXjjcbm0r3xxVAcbFu0sAMPvAg+3YWhN+MQ== X-Received: by 2002:aa7:da07:: with SMTP id r7mr22082888eds.309.1607381044698; Mon, 07 Dec 2020 14:44:04 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Richard Henderson Subject: [PATCH v4 5/6] linux-user/elfload: Update HWCAP bits from linux 5.7 Date: Mon, 7 Dec 2020 23:43:34 +0100 Message-Id: <20201207224335.4030582-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201207224335.4030582-1-f4bug@amsat.org> References: <20201207224335.4030582-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) Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/elfload.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8f943f93ba7..0836e72b5ac 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -986,6 +986,19 @@ static void elf_core_copy_regs(target_elf_gregset_t *r= egs, const CPUMIPSState *e enum { HWCAP_MIPS_R6 =3D (1 << 0), HWCAP_MIPS_MSA =3D (1 << 1), + HWCAP_MIPS_CRC32 =3D (1 << 2), + HWCAP_MIPS_MIPS16 =3D (1 << 3), + HWCAP_MIPS_MDMX =3D (1 << 4), + HWCAP_MIPS_MIPS3D =3D (1 << 5), + HWCAP_MIPS_SMARTMIPS =3D (1 << 6), + HWCAP_MIPS_DSP =3D (1 << 7), + HWCAP_MIPS_DSP2 =3D (1 << 8), + HWCAP_MIPS_DSP3 =3D (1 << 9), + HWCAP_MIPS_MIPS16E2 =3D (1 << 10), + HWCAP_LOONGSON_MMI =3D (1 << 11), + HWCAP_LOONGSON_EXT =3D (1 << 12), + HWCAP_LOONGSON_EXT2 =3D (1 << 13), + HWCAP_LOONGSON_CPUCFG =3D (1 << 14), }; =20 #define ELF_HWCAP get_elf_hwcap() --=20 2.26.2 From nobody Tue Nov 18 01:24:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.66 as permitted sender) client-ip=209.85.218.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607381051; cv=none; d=zohomail.com; s=zohoarc; b=TutaC1w8eziRoQroL6NwZMyf1tF2NhHXX72Rv72F+WPYQsHcLCUZYQdWEbV6/ttc4xDsrFEcRN6YbdGQmRyyo7OsSQEK2/WU2xoSPq15W3tiuxNngc9srl4iQiyaV1/PROifmqi2xCzVoTudmSuB2Ue3QuCQTEcAUHsMLevYBps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607381051; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ebX6EqR8iV+mywCcc9nVlxDVQFJHaCVIYwiIj4Zd7QM=; b=Da7HneHARdCViGpGPmqO2pK20I3NZURkQpDy8fmZajBEjmwXKBHnTurSm+gVnnajhGJGy9Hz2aSqPPJDMNu/8P7t+/AikzVjTa7B7aV5826pZ0u3sa9YC3CJdpAFVbvlTK7NtpVMSNUri+fbZFoLZYQvVHbcSSdfeEigufU8MHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by mx.zohomail.com with SMTPS id 1607381051575787.2585773842978; Mon, 7 Dec 2020 14:44:11 -0800 (PST) Received: by mail-ej1-f66.google.com with SMTP id m19so21820438ejj.11 for ; Mon, 07 Dec 2020 14:44:11 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id r7sm14951863edv.39.2020.12.07.14.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 14:44:09 -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=ebX6EqR8iV+mywCcc9nVlxDVQFJHaCVIYwiIj4Zd7QM=; b=Oriq1RjC0ujDCiVlQZA7KuSM8Uu3hud48XW9Exnen8UoJkUvQXn8mk3Hm2ePUva9oh oEUzQjVF0r6uB/nJMU4WG54N2QfwkTZLR9xCIOMbtsmHh5IoKb+h3TLTfCcX5zE2nxur rJwGbGnimZZsVA7EoCSsRD44eQRlg15/Fn/+zZNX1UYXIA6lx/FPKQpKriWN977Ut/Zh 3K508JDVEPMHl6fWMAkaa1i54evLS4uAjagrPR01xtV7MU7MGQNtWUCAY/R6n5TojuHD SwmfiJ4Ndjglwyd196J4yzR36ZCEiurQ7b/nuOe33OUwDwsjbB0UO5cL1iB0oIuvvgUA RObA== 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=ebX6EqR8iV+mywCcc9nVlxDVQFJHaCVIYwiIj4Zd7QM=; b=oCRmahY7e/8fFBE5gwaXmhSMne0LE1eapwEiyqdeDyVanhyCFPIN2tblTJonADVxed mJyd1tnXq2dAf1cq3EzZ11aQQulGfN5VcnF/BasLcaFR/RIp541onMzq4MsAnYay2JIi eHn9VHKqmWhWh+3NVLeb2Ap5Civhl+FRWEdDm/AW6SPP4795NqbSxQRo05+SZLNbQKIC b3VAsZ1U84OIPtHhF91N4Gja3fE+EbIAFC4umQ/I49pqrqyhdCpS/ahnHGE1ah4+s8ZI cYDI+m3wiXA6rkifKPNCaMmlLmStSm0INPHaL6dBzjL/0LOmwTT3t/8oBspLzbRPLTAA U1hQ== X-Gm-Message-State: AOAM530h3kpcf9v6xko9dsQAkzKWRjCzRRsRFwjnwCdovPXNrDLYbNS+ b2syuLoqW4dqXaR9DpDspA4= X-Google-Smtp-Source: ABdhPJy34bJrANzmK4xqXXK2kIzqAvRkQDXfKqEH3VucBRmwYbhsaiAvSxu1yLc3/y+KXOhEp7RmPw== X-Received: by 2002:a17:906:9605:: with SMTP id s5mr20994359ejx.179.1607381049838; Mon, 07 Dec 2020 14:44:09 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Richard Henderson Subject: [PATCH v4 6/6] linux-user: Add support for MIPS Loongson 2F/3A Date: Mon, 7 Dec 2020 23:43:35 +0100 Message-Id: <20201207224335.4030582-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201207224335.4030582-1-f4bug@amsat.org> References: <20201207224335.4030582-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) Userland ELF binaries using Loongson SIMD instructions have the HWCAP_LOONGSON_MMI bit set [1]. Binaries compiled for LLoongson 3A [2] have the HWCAP_LOONGSON_EXT bit set for the LQ / SQ instructions. [1] commit 8e2d5831e4b ("target/mips: Legalize Loongson insn flags") [2] commit af868995e1b ("target/mips: Add Loongson-3 CPU definition") Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/elfload.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 0836e72b5ac..a64050713f2 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1024,6 +1024,8 @@ static uint32_t get_elf_hwcap(void) GET_FEATURE_REG_EQU(CP0_Config0, CP0C0_AR, CP0C0_AR_LENGTH, 2, HWCAP_MIPS_R6); GET_FEATURE_REG_SET(CP0_Config3, 1 << CP0C3_MSAP, HWCAP_MIPS_MSA); + GET_FEATURE_INSN(ASE_LMMI, HWCAP_LOONGSON_MMI); + GET_FEATURE_INSN(ASE_LEXT, HWCAP_LOONGSON_EXT); =20 return hwcaps; } --=20 2.26.2