From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaN7N-0000RW-Ml for qemu-devel@nongnu.org; Sat, 13 Jan 2018 09:49:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaN7K-0007H7-LX for qemu-devel@nongnu.org; Sat, 13 Jan 2018 09:49:09 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:65373) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaN7K-0007GJ-C6 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 09:49:06 -0500 From: Laurent Vivier Date: Sat, 13 Jan 2018 15:48:47 +0100 Message-Id: <20180113144847.8403-4-laurent@vivier.eu> In-Reply-To: <20180113144847.8403-1-laurent@vivier.eu> References: <20180113144847.8403-1-laurent@vivier.eu> Subject: [Qemu-devel] [PATCH 3/3] linux-user: MIPS set cpu to r6 CPU if binary is R6 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: YunQiang Su , Riku Voipio , Richard Henderson , Peter Maydell , Aaron Sierra , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier From: YunQiang Su So here we need to detect the version of binaries and set cpu_model for it. [lv: original patch modified to move code into get_cpu_model()] Signed-off-by: Laurent Vivier --- Notes: YunQiang Su, please add your Signed-off-by that was missing in your original patch. include/elf.h | 4 ++++ linux-user/main.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/elf.h b/include/elf.h index e8a515ce3d..f2104809b1 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/main.c b/linux-user/main.c index 2fc2267fd4..3229ef079e 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4285,9 +4285,19 @@ static const char *get_cpu_model(int fd) return "Fujitsu MB86904"; #endif #elif defined(TARGET_MIPS) + int ret; + uint32_t eflags; + + ret = get_elf_eflags(fd, &eflags); #if defined(TARGET_ABI_MIPSN32) || defined(TARGET_ABI_MIPSN64) + if (ret == 0 && (eflags & EF_MIPS_ARCH_64R6) != 0) { + return "I6400"; + } return "5KEf"; #else + if (ret == 0 && (eflags & EF_MIPS_ARCH_32R6) != 0) { + return "mips32r6-generic"; + } return "24Kf"; #endif #elif defined TARGET_OPENRISC -- 2.14.3