From patchwork Wed Jan 24 21:13:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 865484 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 3zRdLW1Jr8z9ryv for ; Thu, 25 Jan 2018 08:18:11 +1100 (AEDT) Received: from localhost ([::1]:46882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeSQr-0002LC-9P for incoming@patchwork.ozlabs.org; Wed, 24 Jan 2018 16:18:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeSMQ-0007kl-1w for qemu-devel@nongnu.org; Wed, 24 Jan 2018 16:13:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeSML-0006Uu-JG for qemu-devel@nongnu.org; Wed, 24 Jan 2018 16:13:34 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:51511) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eeSML-0006U7-8n for qemu-devel@nongnu.org; Wed, 24 Jan 2018 16:13:29 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LtWNA-1eo6s43ubc-010sC1; Wed, 24 Jan 2018 22:13:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 24 Jan 2018 22:13:00 +0100 Message-Id: <20180124211301.10095-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180124211301.10095-1-laurent@vivier.eu> References: <20180124211301.10095-1-laurent@vivier.eu> X-Provags-ID: V03:K0:7nmAab6ICNO16VZ/cbsTtEycfxd5gJh95HH6cnrqMigxlSWRY2h KbNTnRnCfUKeHXP5BsRTDezKzQKm9H/7D79JiKLvj3amAQQru0L/1EkcsLGfoyS61zT/IIH 4/7ybx08HnYq1/kN3RPrxAEyvHv9VxEUJUdMY7SqXWQt28TEg+ex6yxoavSE5G3nq4qM37k sJis7iAgVU56IJIdlMyCQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Y0v29EPUNEs=:MIZAxfQofviVF4LZEdpo4D F90067G8bGNxyDGzmEKiGc784U6/SZWxNr9hNihFTB5iR2mEs3nRBqSrM1EYGMliHYnfZRTKs VPh/JH5PEQ/4E/oX98MG9qdalhIFYm1ROQzPo6W6+lQTZslfpG6PmdG1KbO76vS++X7znoLTC OzAs97MIy1K0+R2a8v9dWsw8FobzgXRyVAtSMGmVpE5PeFkAF26P8D8z6GkI+ukIGdKyz2Jjk khnUiZt/eC5gyqH2Fhg5/tDFLlo1ItbNAuZJJSKb2ocMycNrmZhxdA7ngPJ7S2Ts1dIscXRM+ BefOg9/8VJiX+Zm39B3RypGnK+JQlTnhs28BjCPCk3LztnNFUKcrq4HFz6yzGkHfrHR2lLZ/P +AK3Mtzy3dexZBT8dkj/QUrngILGO/N8vphOJ5GbnaqVsXFR9UaXg+xQWY692n2H/Y3aXtWmr PbwQtCxrSXOfijeyRvdEbC/363lFAcgJWTACMe9sv4IRDHAdYJJ+H0sGOuHReOojfvguuKBmF 08zb3Oq8xARkS5E/5crRtzwOBI/CdLC4uP6In0FyRLnOG6ww72bM4QcmOwSnAwrFySUMMxIqX EZTcmRnqxDVTOJCQ3eyAHjj3XqBh98VCvUMlQUdQHMXDiXsADZbThf1GKu9ueg2F8MywN/Qvf e9OMPQx48Xl3dkNLvTT5celMG9xE9h9aMusk+TIMnW471+5QLpWmkESz6DQKrsiAjjpJ5E1xM ZCnvsUWJ6ZM+6JF9hGj7mzD/FgrK9vgqhUq1sg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PATCH v4 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 --- 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