From patchwork Mon Feb 19 17:10:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10228417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 31484602B7 for ; Mon, 19 Feb 2018 17:13:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21F5428A77 for ; Mon, 19 Feb 2018 17:13:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16AAF28AA0; Mon, 19 Feb 2018 17:13:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 89AA028A77 for ; Mon, 19 Feb 2018 17:13:04 +0000 (UTC) Received: from localhost ([::1]:51447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1enozv-0006h4-BW for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Feb 2018 12:13:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1enoxt-0004ud-Dj for qemu-devel@nongnu.org; Mon, 19 Feb 2018 12:10:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1enoxq-0005So-3D for qemu-devel@nongnu.org; Mon, 19 Feb 2018 12:10:57 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:47171) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1enoxp-0005S4-OP for qemu-devel@nongnu.org; Mon, 19 Feb 2018 12:10:53 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MeXgF-1f7zCt2Qrn-00QBIp; Mon, 19 Feb 2018 18:10:44 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 19 Feb 2018 18:10:36 +0100 Message-Id: <20180219171037.24539-8-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180219171037.24539-1-laurent@vivier.eu> References: <20180219171037.24539-1-laurent@vivier.eu> X-Provags-ID: V03:K0:AV1kk+qZ+GMaAFL+UCQqgB30tBS+gxQ9uoJwfhlHlyInIJVLCwT EagsMuXYp1OrGU1dPleocUunI9fAvQoJNFZIhbims8/FTxz9J2QdP/mzIJm5wJGXqJ4/RPO 5IAdpboXsnGjFzeu2rXSc2QuiTBAkqQgFssDUkcOlhQ336s8aAm0nqc4GdBL02D4b7qBt5P SZRgdsjzOihiklESOocMw== X-UI-Out-Filterresults: notjunk:1; V01:K0:o5R6KQzG7zI=:Rh4bgwctqJkUjz/RcIUFNc 6BHJ7Jya1+YJdJufUOvV8NeS4wvpiGQrvdiPy5vNnKWSVQUHbx77iU6G5AYBDs+zrTxPmsIB3 W3Byukpvv+2yY9UspQxmJvH/1vxdqtD4wgkpGA7BKliQ19LotES4oqF7PeQJN1aDx30LD5qCD QFfw8y37ywPwB6QMYHcFyRBWluG/cI/p+MOvarwhfKmFLJs9X5WZ+wawrqmAf7u+hHxNZqJ2K 4PcqYDe2BQVCSlp6pU9klxFhtXiyZ7eOu6o7BqN6Ca13uJOJ0fXljiIHvdRmMqG5VshWxkNkc yyk/PkOr7TGVJcgcGMxAMYawxoOrrtayomihgBIw6AT14eb59iG4WdK8IPDs4xxtv2S1By5Hf A2V1E5IqXYPvoNuOqjTlyQjd8Mb3thH5H0/f206G+rx0/chi+5qX60ql/+IG6KAYqSnR+KmWM XJ1LmARpQqgCzeq0NU3ODoRi1IfZQjb0e7awKw3qO1StKjBZAjcEQINTi1WDhESJ1h8r+eVrf 6rNdSAdGK2rFbI6nLj7TkD00DxOZN5B14C1j0pPHe07U0raIi58HfmmBLrhk124pYwSsW6vwG z5O6567qijbjzfyoP6peDC+19DVrZHLTHUNdAgINrIfw7mhsFT77hF/W9ET4puCwudaTkTQ5k aUxSsq1V2yGijEt6+MB7wDcMCXp+y51HlQsXVzytNZm6y6yFt+dqExw54HA+H9k/Bi+iPGY44 /lY9vn7olZpmJ3SJxa7lCBnX7mNqHJBelg4HkQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 7/8] 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: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Message-Id: <20180124211301.10095-4-laurent@vivier.eu> --- 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