From patchwork Sat Jan 13 14:48:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 860352 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zJjFg5khsz9sP1 for ; Sun, 14 Jan 2018 01:49:58 +1100 (AEDT) Received: from localhost ([::1]:42473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaN88-0000SW-Ll for incoming@patchwork.ozlabs.org; Sat, 13 Jan 2018 09:49:56 -0500 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 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MaoHu-1eG5LL1YJm-00KNkm; Sat, 13 Jan 2018 15:48:53 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 13 Jan 2018 15:48:47 +0100 Message-Id: <20180113144847.8403-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180113144847.8403-1-laurent@vivier.eu> References: <20180113144847.8403-1-laurent@vivier.eu> X-Provags-ID: V03:K0:eRHES0d1f9CqAYjwJmNPylmxZAfvRN7khbpjMln0mqInm3Qr0xq Wxsj6gCwL/BJhMM/i3vhQ19xDZb+Lg+fR5j4OT21eH+J2CVzvkR/ZenKgL1c1W7GNUhWqoL V2vX2Ax8epaZOSVt1OwTFAQSBZiA3Q5wiLVw1OPPmsbvofWZGcfONLXvBDrc+G9RBf6/tHc EtGW/QTmrrtVxSYRtakzA== X-UI-Out-Filterresults: notjunk:1; V01:K0:+1rjJipHA/o=:uR/LJ/YJdgnVn4KhNxrqLy 420lwbValFkrUI7XDA3QzGhLoFO1jQgwVkdmRw0gDTUi9A/jPiUw+8YS4kSE2CBGyGm3CwqaN XD5O6PQ1zHm2MWmYgzq+hG/2Zd4CulEDCcYKBmitYLanBDfzKTDAIexO9fAYo1iNHCtAHEFcj 2pNBLHHsJQQXROp5o6iW7+6BGnhNjGOG3EklJ1NxK11YV4rMXf07pk49Zvu+Jxib85j5gK1K0 l5ocE8+ZSWQmC1t72n+Kpxy0Yz+mQHxQoMTi9uSPNYLVPRWcBhCh43TTMXE2XdRONvb7ydSwI o02xX59oj7y2ZZyUg/4vPKnKaVOXJucsBlGPBMbWdG6v0VuESX+PK9JPFlbeZqiZKBFWYcgUT Ajpxyt72zYuvIMdblsxh9SJwNuZHPl2Fh9jnTEdFkT3xxKb+XYnvX7WxFeAkgJowYaEecVC86 msDCur5G32vT6LC1COrXf8ABj27Xt0bKzx+Q0iFrk+lFWPlW3kjdDcqgFlOBlZMX3yOwHwsZd IWip6LE3JKj74NUBK62PUVjd5QhcURT70z9k7F/ehaFWnIVt5BVuWDARXZJCJ9FdopICf24AW UnKpgDtAxx8AfxeZJkGjygFJFn8Ts3QFY4ABMMDOlK22oo18SsVkP/WzlQnVOlROYc8ALojiJ LZGPjxRHjNKH8Z3DNJekXMuPZ7kPH8TGuZ++QdKyHIAib4u4GPYZYgR0bUfTeSorXqJQMqP/M FxtO+6rVQtVh6x749uWLnqRXgaUv9XDIEy3HiQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH 3/3] linux-user: MIPS set cpu to r6 CPU if binary is R6 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , YunQiang Su , Riku Voipio , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , Aaron Sierra Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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