From patchwork Tue Jan 16 17:25:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 861798 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 3zLcZV2K52z9sR8 for ; Wed, 17 Jan 2018 04:26:09 +1100 (AEDT) Received: from localhost ([::1]:50759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebUzu-00008o-8u for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 12:26:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebUzR-00007q-7d for qemu-devel@nongnu.org; Tue, 16 Jan 2018 12:25:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebUzO-0001P7-54 for qemu-devel@nongnu.org; Tue, 16 Jan 2018 12:25:37 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:64350) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebUzN-0001Ny-GX 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 0LeyNP-1fBc4R30Fr-00qkb0; Tue, 16 Jan 2018 18:25:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 18:25:09 +0100 Message-Id: <20180116172510.28878-4-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:jKv9j/8VNDYsTAzJhTZujKkfSYX+D2C3Y4MzGTjnxkSSrG1CsY9 qn6JB6zStdH/bWn4qjmykFMx1ICSXRYtjFsZ8vAw/8u/0wyfkb5Fhgtx5Dr7hh6Kn4T2N3D MIoGb3u5ukDh7AdB6gqaIi76asY8vtAJIoS6MycfGzE4DMqQHKXAac5inaCiKaRkWP+Kci7 QC7/cCU9yfKqItDaXAQCA== X-UI-Out-Filterresults: notjunk:1; V01:K0:rqNknZuqkZU=:g8D8j6j+fen1sb3EnfAN6m TSfmvBJ+yWNYa+6SUJn8mhsBhJsUR1p7LDiczRLi3euxo0yZwzTm59f/Jra9BF2GtYkCr8QmH u8dWVX1Q/ne3DtDnOTGYRynA+Y7CID38TePTD9Pu3u+BDbDURZEQ66gU5Jw2g9z1xqdM6nDDY Gau7Kz9ReBExzSUIZD26yPOTHV6tSkr+gIvj+xblks3edcENV9vgZh8Mkig7IQcXYbcdDvQ4c Q8+SngiHyyzPIHW2zaz7QbK/EKO8ObK9neMc8Lohf55bFb7sZx4zC6bFuCKWk96BKnS1auc/K Kz7SdrJtbJ9YKxuuDwiGiNgKuKC/nlyEAzZLXhxuc48mKyWgnyLTJzahJlRyfFsaMtOiwgT1B yG5U/AOxIRJ/kDZxXuXufXEKm7IGyXx7JTS4Zfi6Fy0xD2/AFIMNaFly5l+7NGdSg1r8Itwcp 3nS1MsECymm1+v5vfFPwU2E3LiWxPozcFfwDg11En6cjWTjGW0JTNT0QgIgyZQ5w2jFUx9Isq DerJ3jdbFDZdmKNXkI2OpH/EtKWUJ5tKctuH0w5Tdwn84JGbaYF9jQUM0T2Oc/EEV3qwXcMyk eJG2ViAvRS+88F2aMcqXpoCkR+odVibVaq2a4B3yZG7qx3gyWBBfAjYCJOIKrhdaTqvVOWFVg l6qfs1VeUQIAKO1HzocdvmvFbIceaBkGkcEbS+hR8aCybUrRI0PWYgcGU//fytWS2R8iWygOQ PiKb8rygpxNyRWLGwoikYpH36ns2zz6SIQhKmg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH v2 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 , 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 ("m68020" 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 --- Notes: v2: call cpu_get_model() with the result of get_elf_eflags() linux-user/m68k/target_elf.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linux-user/m68k/target_elf.h b/linux-user/m68k/target_elf.h index df375ad5d3..946b90f342 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) { + /* 680x0 */ + return "m68020"; + } + + /* Coldfire */ return "any"; } #endif