From nobody Wed Feb 11 04:36:46 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 1515855068651240.15567543472753; Sat, 13 Jan 2018 06:51:08 -0800 (PST) Received: from localhost ([::1]:42504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaN9H-0001ps-Tc for importer@patchew.org; Sat, 13 Jan 2018 09:51:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaN7N-0000RY-N1 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 09:49:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaN7K-0007HH-Lp for qemu-devel@nongnu.org; Sat, 13 Jan 2018 09:49:09 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:53584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaN7K-0007GM-CI for qemu-devel@nongnu.org; Sat, 13 Jan 2018 09:49:06 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MBo5j-1ek1tj2clz-00Ao4D; Sat, 13 Jan 2018 15:48:52 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 13 Jan 2018 15:48:46 +0100 Message-Id: <20180113144847.8403-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180113144847.8403-1-laurent@vivier.eu> References: <20180113144847.8403-1-laurent@vivier.eu> X-Provags-ID: V03:K0:o2gtiArl+TjHR8ghH1BI1PfbmtPcGBzsSdATnXK7ltt2l0t6G1j NRH88f4gNlze/OshYYhppIlxyHgfxXLm+lV2DwlAP10U2bvWCwKpRQ6IZqN4MdQGFzTLyMx T5FuZwdkR4xHJZ5yy6Y8KBdK8FuW+kok5dhwrv7joBh8kYHye0DXMyRhwRe7WNpM7MHTdVx kgkIrbYR1deFmzTOz+1cQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:XGuKMoIC9ZE=:DBZm+yXsUizkLh22HP/+Di 67OncD8fn/Cy0CWfHHX1+b20FfNsQosXGUsibPIoI6HBQo8PTKfAlTU/BQyPTf+pR2+RwcHGN ja3ZQFjU3Lgm8SIU7KfB5NjiIB5ElET8Z6pPVaIBfxMj33P3GJ4kPEesfM7LP2pNe207xXR5Z alAl/buI0jBGd36IBB3BFiS7MR1heO3BvpkiYT8zQAcxF9tOJinChfCkks1CXL3gDo3/oFZuK A5Ox+Tuz2U0Nukzbx9q5wcadJSE7VM5Q5WniSkCYGQNuuVA7FXrWtKwTU1cvXIObxPLfaiyvs K/iOW8xfxExZCByS4aCYa+9uQClmpoAA5j1tQwYc/K0OrKVXVXxhfvBUjzeJJQJwCpROm9i/i R4YLaZJDJUrMHqfLHZQEZ1fkg4kgTUTPgsUIHaP3aaKWc0xhRd+XoSuNnKSLmzpOcPMvnmUik wKQ0cb0Qgm8wf5tvsj2HIGY6FWotFYZIOZsFzmHIxGkWBtLVDHs7ZGmJL/0BfhUj4fUpX3ADL 4ZG2zZdW4CtK0nZEfWSoNL42vDHkG8yLGF73woA4ot4tFus19SEDnBY9Y6ZF+rtuSv3GZqRM7 mQSl8+dKDwgqC5kTQQI3DK2Lebj2mgaQlmGTo28UZWmIOg+wRHByABzME9BIkMKlsWkIOjo77 MCKaLf7bLI6MAJs2tVOE8E1BqLgZXzqyVs4y/VX/ZnRRFskT+8xmS0mM50gKv6K2yiwsGLUKO yQzRRVL97BjiLXkQGgbgM3OgG7pWNVbMmH7e5g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PATCH 2/3] 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=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Aaron Sierra 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 ("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 --- linux-user/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/linux-user/main.c b/linux-user/main.c index 9ce90ae634..2fc2267fd4 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4267,6 +4267,16 @@ static const char *get_cpu_model(int fd) #elif defined(TARGET_UNICORE32) return "any"; #elif defined(TARGET_M68K) + int ret; + uint32_t eflags; + + ret =3D get_elf_eflags(fd, &eflags); + if (ret =3D=3D 0 && eflags =3D=3D 0) { + /* 680x0 */ + return "m68020"; + } + + /* Coldfire */ return "any"; #elif defined(TARGET_SPARC) #ifdef TARGET_SPARC64 --=20 2.14.3