From nobody Tue Feb 10 00:25:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519581753659812.1382758509685; Sun, 25 Feb 2018 10:02:33 -0800 (PST) Received: from localhost ([::1]:55403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eq0d2-0003b2-Ku for importer@patchew.org; Sun, 25 Feb 2018 13:02:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eq0aS-0002Dv-9W for qemu-devel@nongnu.org; Sun, 25 Feb 2018 12:59:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eq0aO-0002lG-Dp for qemu-devel@nongnu.org; Sun, 25 Feb 2018 12:59:48 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:50767) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eq0aO-0002i0-3R for qemu-devel@nongnu.org; Sun, 25 Feb 2018 12:59:44 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MQwFa-1fJ3Gd0Fby-00UIlR; Sun, 25 Feb 2018 18:59:33 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sun, 25 Feb 2018 18:59:27 +0100 Message-Id: <20180225175928.13101-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180225175928.13101-1-laurent@vivier.eu> References: <20180225175928.13101-1-laurent@vivier.eu> X-Provags-ID: V03:K0:TJ1S+0U5GBPnVmlBVdYLK9gmYscaNxxoSZqhnhei810XCCZfnVd t2iwjkSRTNLHtARh2rvQEiWIY2P8NcIvv7XeizeaGF5XFoFYXdiGd+c0dOCWZxBxoEjUzgg sAzwBCSCsI7j1yh99/ARVxxB2WR8GwUYdQmbr/IcuCHd76rC3l3KapNJyZWW9m24ipwXVwa VO8ZtU5ufvMdBzhYzl0dw== X-UI-Out-Filterresults: notjunk:1;V01:K0:6cZn7yNbwd8=:4zulO9G/pEMiiqjhdibD2C apFSebQq/Z8ShjDqb1juBuZCoL/Vld8Tgxn69MgVgTd29mXojLkUOFRnBb/3CNMpod8tK4LhR 0gYjjvT0kUPErmUbquPAHlP5k+zEI97BWwOsf2a/Mp/zv6DcqWJdfCIIoYRYZTscz/k2eDdJo VGdGcohghDXF7erewaaK1/OzO9Z5A/V1DFCdkiE4cqlnoswg2LJPlP3KSh9GsM0dOYcIdaWlT BNWK+1DSYwv8FQ9bP5uirBTw+6cCpGcDvWG9cQAXTOnwIsagdb/DMGrFYC4bsRt7JXLr5Y9ss LIFBMlxgK8zEC/tNtIEgV3AtnrUuEMQYtVROYYd2ABoSAnDtazK4MzhdBccv/DItK/7fbX3tU k5aW4ofhVgEVVIgXsVJHQq9AOtOM5Qa+NQ8pHzbzQCrB/jwL7grHDyHBTzKmCA8pW0eNYIrSK mTBWhX2d9KwAczrwuoM3jMoAMlU+tTPA/cb3Y+8pWRzDrzU1j+i5b509IKc0ENNJJ4Odqd7xA J/5C+ubzjhL1m73JOmIGzLNCy24xMr+9NSKwb/25T++JTGDCWj63r6F+wNHbI8n58dT3clscs W+GaGsYq8MbNWBhnRr6bwZLWQqHJ5xmyaWm/muJiLwwaDTiLeRD1vz2lSu5Q0koaat7T2vHQn sGBna5fE/pWVJUGoTE/to1pP4zmG4O8VKy58+P70k/AS4nETK7vUknRh/QpoYti8iNsJbwzBU /acPtKVPP7KksMCt66ogeR3qPXQ15cvyaOCPNg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 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: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: <20180220173307.25125-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 =20 +/* 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 =3D=3D 0 || (eflags & EF_M68K_M68000)) { + /* 680x0 */ + return "m68040"; + } + + /* Coldfire */ return "any"; } #endif --=20 2.14.3