[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/4] linux-user: MIPS set cpu to r6 CPU if binary
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH v3 4/4] linux-user: MIPS set cpu to r6 CPU if binary is R6 |
Date: |
Tue, 16 Jan 2018 23:22:12 +0100 |
From: YunQiang Su <address@hidden>
So here we need to detect the version of binaries and set
cpu_model for it.
[lv: original patch modified to move code into cpu_get_model()]
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
Notes:
YunQiang Su, please add your Signed-off-by that was
missing in your original patch.
v3: fix code indent problem reported by patchew
remove useless "!= 0"
v2: call cpu_get_model() with the result of get_elf_eflags()
include/elf.h | 4 ++++
linux-user/mips/target_elf.h | 3 +++
linux-user/mips64/target_elf.h | 3 +++
3 files changed, 10 insertions(+)
diff --git a/include/elf.h b/include/elf.h
index ca9a419043..746b6d393b 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -40,6 +40,10 @@ typedef int64_t Elf64_Sxword;
#define EF_MIPS_ARCH_5 0x40000000 /* -mips5 code. */
#define EF_MIPS_ARCH_32 0x50000000 /* MIPS32 code. */
#define EF_MIPS_ARCH_64 0x60000000 /* MIPS64 code. */
+#define EF_MIPS_ARCH_32R2 0x70000000 /* MIPS32r2 code. */
+#define EF_MIPS_ARCH_64R2 0x80000000 /* MIPS64r2 code. */
+#define EF_MIPS_ARCH_32R6 0x90000000 /* MIPS32r6 code. */
+#define EF_MIPS_ARCH_64R6 0xa0000000 /* MIPS64r6 code. */
/* The ABI of a file. */
#define EF_MIPS_ABI_O32 0x00001000 /* O32 ABI. */
diff --git a/linux-user/mips/target_elf.h b/linux-user/mips/target_elf.h
index bed0b43259..14b53d7469 100644
--- a/linux-user/mips/target_elf.h
+++ b/linux-user/mips/target_elf.h
@@ -9,6 +9,9 @@
#define MIPS_TARGET_ELF_H
static inline const char *cpu_get_model(uint32_t eflags)
{
+ if (eflags & EF_MIPS_ARCH_32R6) {
+ return "mips32r6-generic";
+ }
return "24Kf";
}
#endif
diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h
index 5b6f4692e0..ae14b38bfa 100644
--- a/linux-user/mips64/target_elf.h
+++ b/linux-user/mips64/target_elf.h
@@ -9,6 +9,9 @@
#define MIPS64_TARGET_ELF_H
static inline const char *cpu_get_model(uint32_t eflags)
{
+ if (eflags & EF_MIPS_ARCH_64R6) {
+ return "I6400";
+ }
return "5KEf";
}
#endif
--
2.14.3
- [Qemu-devel] [PATCH v3 0/4] linux-user: select CPU type according ELF header values, Laurent Vivier, 2018/01/16
- [Qemu-devel] [PATCH v3 2/4] linux-user: introduce functions to detect CPU type, Laurent Vivier, 2018/01/16
- [Qemu-devel] [PATCH v3 1/4] linux-user: Move CPU type name selection to a function, Laurent Vivier, 2018/01/16
- [Qemu-devel] [PATCH v3 3/4] linux-user, m68k: select CPU according to ELF header values, Laurent Vivier, 2018/01/16
- [Qemu-devel] [PATCH v3 4/4] linux-user: MIPS set cpu to r6 CPU if binary is R6,
Laurent Vivier <=
- Re: [Qemu-devel] [PATCH v3 0/4] linux-user: select CPU type according ELF header values, Igor Mammedov, 2018/01/17
- Re: [Qemu-devel] [PATCH v3 0/4] linux-user: select CPU type according ELF header values, Laurent Vivier, 2018/01/19