From patchwork Tue Jan 16 17:25:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 861800 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 3zLcd51QQ3z9sRm for ; Wed, 17 Jan 2018 04:28:25 +1100 (AEDT) Received: from localhost ([::1]:50816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebV27-0001ni-95 for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 12:28:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebUzS-00008E-2d for qemu-devel@nongnu.org; Tue, 16 Jan 2018 12:25:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebUzO-0001PC-53 for qemu-devel@nongnu.org; Tue, 16 Jan 2018 12:25:38 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:50578) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebUzN-0001Nx-EX for qemu-devel@nongnu.org; Tue, 16 Jan 2018 12:25:33 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LdZry-1fJ3GR1s3O-00ilRj; Tue, 16 Jan 2018 18:25:17 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 18:25:10 +0100 Message-Id: <20180116172510.28878-5-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180116172510.28878-1-laurent@vivier.eu> References: <20180116172510.28878-1-laurent@vivier.eu> X-Provags-ID: V03:K0:OA1d0sb3PUoR1gJFOKLgLHnvV7xJRzEFiYC5CsOnk8x9CJOxA4X HczkfU87u4k4jFWKet16D3JIVuQAYGmxok9rHXYRHu9G8yZnBkZEYFeY2/1rF5IKA7vV6b9 umvX/tHCY3yXVjB7AGkcFw/HZnwYBIer8V/TzHz7Kd4a+JdfLIYb4hFkIwajXKBhG9MCTKR 2RZOSUu3w9Py7sfvPMgLw== X-UI-Out-Filterresults: notjunk:1; V01:K0:3Blvu7RG5dc=:ya3Us2/IFvnvWbhqod2F4W frapH6rGbVSDhsAUIezyBv5Fdea1iF0vyqjJMqUJYa1msagj0aZ+6KsnQebVaryXcLCgTwZOF 3xu9s4CvIgr0opuIqHHasWZoWNiix1aRAUzmIqp14QbsRPmmTn873n1OL/SreBAx3X7gw7k1a JDttAsAJ/d4OGdsVd+R1xFmMLfj+erk9R8aUEpePBtD9Xls/O4bPPFg8y3ybXMterxJ8lD22h tq8i1hX8LcCvYx/2oVGgShOpwq/8h8Z+s3P4ekBygpTPZ8IeJY74hm/wtsrs0Owt8BtsUBkyY /ZJonm093M09YKxMluUw5ss3NopoFazvmmX3/8yvYPiOexLr7F/mugayMQbqU+VPSafpPMqnP /TPf/a1TSgbnCW/JLb+5s3I7m23eTveIeRFLcsCzI5v0pqyeKWIieIcKvwyxm7LYyzcWsjFUB U1/IAwuqeLcs4h6urddGmXpkVG1ueDodlkIQqNNpFUhWpJEDO3AxMz2lDHmRLsqV5Tjrv2krW 9zW3zksdMcJiAWmjKmK/B/fb7npHUUio34S7Ewy5ChLH6O7wd85aT2SxsS7k2G2aXIe3rhHHW /bypnoRmJXbF5jIjfcL5ZFv5VyGNu76KOHQjpQrwsIpOXps1QU9V5iJlGvqPVjTMx1Vj4FtBF oYW7RlHEs7tKQHvVXLUkMJ8B1YVaRd9gWcQ/gHSmB/+R5t8h3YLsl7/i/oMz0qbwdBn/g2fvJ lBFgQs5ZM4xEqB+HnaxejBscIC1AbL7qVBW7YA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PATCH v2 4/4] 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 cpu_get_model()] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- Notes: YunQiang Su, please add your Signed-off-by that was missing in your original patch. 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 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/mips/target_elf.h b/linux-user/mips/target_elf.h index bed0b43259..ac14f99ac5 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) != 0) { + return "mips32r6-generic"; + } return "24Kf"; } #endif diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h index 5b6f4692e0..6cda7ae435 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) != 0) { + return "I6400"; + } return "5KEf"; } #endif