From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 05/14] linux-user/elfload: Introduce MIPS GET_FEATURE_REG_EQU() macro
Date: Fri, 18 Dec 2020 11:23:58 +0100 [thread overview]
Message-ID: <20201218102407.597566-6-laurent@vivier.eu> (raw)
In-Reply-To: <20201218102407.597566-1-laurent@vivier.eu>
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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 <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201214003215.344522-5-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/elfload.c | 12 +++++++++++-
target/mips/cpu.h | 1 +
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index b7c6d30723a3..8f943f93ba75 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -7,6 +7,7 @@
#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 |= _hwcap; } } while (0)
+#define GET_FEATURE_REG_EQU(_reg, _start, _length, _val, _hwcap) \
+ do { \
+ if (extract32(cpu->env._reg, (_start), (_length)) == (_val)) { \
+ hwcaps |= _hwcap; \
+ } \
+ } while (0)
+
static uint32_t get_elf_hwcap(void)
{
MIPSCPU *cpu = MIPS_CPU(thread_cpu);
uint32_t hwcaps = 0;
- 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);
return hwcaps;
}
+#undef GET_FEATURE_REG_EQU
#undef GET_FEATURE_REG_SET
#undef GET_FEATURE_INSN
diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index 3ac21d0e9c07..4cbc31c3e8d2 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 */
--
2.29.2
next prev parent reply other threads:[~2020-12-18 10:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 10:23 [PULL 00/14] Linux user for 6.0 patches Laurent Vivier
2020-12-18 10:23 ` [PULL 01/14] linux-user/mmap.c: check range of mremap result in target address space Laurent Vivier
2020-12-18 10:23 ` [PULL 02/14] linux-user/elfload: Move GET_FEATURE macro out of get_elf_hwcap() body Laurent Vivier
2020-12-18 10:23 ` [PULL 03/14] linux-user/elfload: Rename MIPS GET_FEATURE() as GET_FEATURE_INSN() Laurent Vivier
2020-12-18 10:23 ` [PULL 04/14] linux-user/elfload: Introduce MIPS GET_FEATURE_REG_SET() macro Laurent Vivier
2020-12-18 10:23 ` Laurent Vivier [this message]
2020-12-18 10:23 ` [PULL 06/14] linux-user/elfload: Update HWCAP bits from linux 5.7 Laurent Vivier
2020-12-18 10:24 ` [PULL 07/14] linux-user: Add support for MIPS Loongson 2F/3A Laurent Vivier
2020-12-18 10:24 ` [PULL 08/14] docs/user: Display linux-user binaries nicely Laurent Vivier
2020-12-18 10:24 ` [PULL 09/14] linux-user: Implement copy_file_range Laurent Vivier
2020-12-18 10:24 ` [PULL 10/14] linux-user: Add most IFTUN ioctls Laurent Vivier
2020-12-18 10:24 ` [PULL 11/14] linux-user/sparc: Correct sparc64_get/set_context() FPU handling Laurent Vivier
2020-12-18 10:24 ` [PULL 12/14] linux-user/sparc: Remove unneeded checks of 'err' from sparc64_get_context() Laurent Vivier
2020-12-18 10:24 ` [PULL 13/14] linux-user/sparc: Don't restore %g7 in sparc64_set_context() Laurent Vivier
2020-12-18 10:24 ` [PULL 14/14] linux-user/sparc: Handle tstate in sparc64_get/set_context() Laurent Vivier
2020-12-31 15:54 ` [PULL 00/14] Linux user for 6.0 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201218102407.597566-6-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).