From patchwork Tue Feb 20 17:33:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 875553 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 3zm7910DGTz9sZZ for ; Wed, 21 Feb 2018 04:37:08 +1100 (AEDT) Received: from localhost ([::1]:56818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoBq2-0008Ot-A1 for incoming@patchwork.ozlabs.org; Tue, 20 Feb 2018 12:36:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoBnN-0006kr-72 for qemu-devel@nongnu.org; Tue, 20 Feb 2018 12:33:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eoBnM-0003vo-8R for qemu-devel@nongnu.org; Tue, 20 Feb 2018 12:33:37 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:46447) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eoBnL-0003v2-Ut for qemu-devel@nongnu.org; Tue, 20 Feb 2018 12:33:36 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MOo90-1es1XT49XK-006AwE; Tue, 20 Feb 2018 18:33:14 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 20 Feb 2018 18:33:06 +0100 Message-Id: <20180220173307.25125-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180220173307.25125-1-laurent@vivier.eu> References: <20180220173307.25125-1-laurent@vivier.eu> X-Provags-ID: V03:K0:RxZ/kPRTEEkZXuQ1jmhJEhfNcyb1Tg8vpRWgqIfuMLt603kdnZ8 E9C+hAGSV2uabMN/QP6M909IM/06wKxSBA0G+g/UIskW52DSaHt+GdNhBNxyrxEw20/Ug8I 2tDplCK6zXBy/CBXbhjDE+jxjdwsMZ/MSyZQlWWTXIgO0017TtuFfS/aOckNlHg/idixup6 2NE33bua1/JcagfMECYyA== X-UI-Out-Filterresults: notjunk:1; V01:K0:iV/lRNcO5bE=:kShk5yhdw4JN8svurFjAnv YVCAv+RYtDn/PqEhPFkoMlyBjBFO9MTjwj7oGrikyaamPpvDeRUFYr+KP9Q8hb4XD/+8pA/FD pNqRperIKP3s0kfATsdKXz+oioXYfmCKDV6unBzFLbzZkvm9zfmgBd3NlcGLZOwHSoHcd/1vp MeDIjGY1EzETFFs6UIF3h7jtikXDkuIuZDSDvJSsK/KwqZ3MkSip91PjeplUAMvvBRd8x/2YP azGRh9e3dptdfrlFvrgmwdOApaXj+lArdOwdaLGLnBSRwF0h0RAtyD98O0VaQUsUMWWD77Q3g ETfG/BxhwUQNoviTods0mFnkLHONOUFvbNluF7MOAmlsqcwucK0+1DFGH41JyAbsSmBb+PkCf gatOpeyo+aVqUcgbpYMdLgdh5SQpKxjBnOZNqDPYXE3EWv2NokQ0rrnm0en8q1tv5tU1wo70n w6G6mKxiL6wkQbtBkZ0dgSj/uQ5DT4IsvmPTKI7QG6z5xzVOQ3BVUceVe9BiBi4+rpf1xn4xl cc1Zg1JFsNLUnSYPzZHrZ3+RBNhqelAOFA/PdMnCRNUfEZEmI1g+0szXNediflsV5TWYmXUxd AnA83v4ZV8Tv0BoDkYXL1BjN8IlAAgt6yqGdVQ8MKBQZvOZA+4iA5ZPoCGJSTU3tsseMliTBG HtpkGYoADGJLvLL5zD8QHHIfiohGmpAvc8jgaF1xt5XMihlDIOgq5WlmIZlvS1kFBwoo3b148 mQjGWOUyKpWOIJ1T+vXPTexHCeKf+HW/QKY5vA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v5 3/4] linux-user, m68k: select CPU according to ELF header values 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 , Igor Mammedov , Aaron Sierra Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" M680x0 doesn't support the same set of instructions as ColdFire, so we can't use "any" CPU type to execute m68020 instructions. We select CPU type ("m68040" or "any" for ColdFire) according to the ELF header. If we can't, we use by default the value used until now: "any". Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- Notes: v3: check for EF_M68K_M68000 add EF_M68K_* flags in elf.h set 680x0 default CPU to m68040 v2: call cpu_get_model() with the result of get_elf_eflags() include/elf.h | 28 ++++++++++++++++++++++++++++ linux-user/m68k/target_elf.h | 6 ++++++ 2 files changed, 34 insertions(+) diff --git a/include/elf.h b/include/elf.h index e8a515ce3d..ca9a419043 100644 --- a/include/elf.h +++ b/include/elf.h @@ -537,6 +537,34 @@ typedef struct { #define HWCAP_S390_HIGH_GPRS 512 #define HWCAP_S390_TE 1024 +/* M68K specific definitions. */ +/* We use the top 24 bits to encode information about the + architecture variant. */ +#define EF_M68K_CPU32 0x00810000 +#define EF_M68K_M68000 0x01000000 +#define EF_M68K_CFV4E 0x00008000 +#define EF_M68K_FIDO 0x02000000 +#define EF_M68K_ARCH_MASK \ + (EF_M68K_M68000 | EF_M68K_CPU32 | EF_M68K_CFV4E | EF_M68K_FIDO) + +/* We use the bottom 8 bits to encode information about the + coldfire variant. If we use any of these bits, the top 24 bits are + either 0 or EF_M68K_CFV4E. */ +#define EF_M68K_CF_ISA_MASK 0x0F /* Which ISA */ +#define EF_M68K_CF_ISA_A_NODIV 0x01 /* ISA A except for div */ +#define EF_M68K_CF_ISA_A 0x02 +#define EF_M68K_CF_ISA_A_PLUS 0x03 +#define EF_M68K_CF_ISA_B_NOUSP 0x04 /* ISA_B except for USP */ +#define EF_M68K_CF_ISA_B 0x05 +#define EF_M68K_CF_ISA_C 0x06 +#define EF_M68K_CF_ISA_C_NODIV 0x07 /* ISA C except for div */ +#define EF_M68K_CF_MAC_MASK 0x30 +#define EF_M68K_CF_MAC 0x10 /* MAC */ +#define EF_M68K_CF_EMAC 0x20 /* EMAC */ +#define EF_M68K_CF_EMAC_B 0x30 /* EMAC_B */ +#define EF_M68K_CF_FLOAT 0x40 /* Has float insns */ +#define EF_M68K_CF_MASK 0xFF + /* * 68k ELF relocation types */ diff --git a/linux-user/m68k/target_elf.h b/linux-user/m68k/target_elf.h index df375ad5d3..998fe0fe2f 100644 --- a/linux-user/m68k/target_elf.h +++ b/linux-user/m68k/target_elf.h @@ -9,6 +9,12 @@ #define M68K_TARGET_ELF_H static inline const char *cpu_get_model(uint32_t eflags) { + if (eflags == 0 || (eflags & EF_M68K_M68000)) { + /* 680x0 */ + return "m68040"; + } + + /* Coldfire */ return "any"; } #endif