From nobody Thu Apr 25 11:54:24 2024 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 152378571825231.17215834356091; Sun, 15 Apr 2018 02:48:38 -0700 (PDT) Received: from localhost ([::1]:57206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7eGq-0001QI-Fp for importer@patchew.org; Sun, 15 Apr 2018 05:48:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7eFI-0000jH-9k for qemu-devel@nongnu.org; Sun, 15 Apr 2018 05:46:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7eFF-0007ON-5A for qemu-devel@nongnu.org; Sun, 15 Apr 2018 05:46:52 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:45551) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7eFE-0007Mz-Qd for qemu-devel@nongnu.org; Sun, 15 Apr 2018 05:46:49 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lc2V7-1eiEzY4AEv-00jdmZ; Sun, 15 Apr 2018 11:46:46 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sun, 15 Apr 2018 11:46:38 +0200 Message-Id: <20180415094638.3278-2-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180415094638.3278-1-laurent@vivier.eu> References: <20180415094638.3278-1-laurent@vivier.eu> X-Provags-ID: V03:K1:A89b9wyyjKk0vCC2/KoYPla9uu+r1iN/EJerDtTQvgNTkLUpk0+ WQnQ6BoSUFxoIz3Pa2H0U+A89/UvUmfX37XeF1PhSEMsf1WxBiCu7Yibqy9kcj71qjW3lOj SczPikenmcQ04ZspjZMjjAi0Q1+q6PhFtHBSNcem1XFVu/MBv41abtwRXN6iGbWi1t+A5El 6hrK47ppPD8Ea/kMEOBPQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:VGfrQUZnNhY=:hxjGyswAODkcnaJ5mpqVq4 KhziD82L0X0ecZyu7dac5DCQ4E4ABUUFGbpukgrUgMKXGDhu3SVw9DY96bOCTprW7q6/yd2s9 zu8n92PJElPrvyAS4oG/YEXuYYxYeFNt1Ip6WPhTxmhDnndTJ+/67BJVZXT1DDzZr1kTH13Jh Rt4gmTc/Qku+8RQ/R4OMfT2Qw1h740JJ/vQnI0TE1cPv7F7DKOMV/ZFO0SjbsUWwEjvwizU8E WZuTMp+fT01A6cWkOviyYazNAWWsCwwyaNXveCGYk+azPwYMfZba+IDasuVhnzUCCAz7aeitP K2dQ1PkZDkebTGEbY5jd4Kp1CzJIv67JAind9Eem+2tVApRuxTaYmPGXvjVdxrPyp3GFaesnm 1RFX1q89y3E8/Oi+U3z4k2VhbmbZ0Wd9xg9DVrJzlj4TIKs+5kF8q4hlkthU0QF66BVyWeIf7 lRV9XUgGDdmJaLQi8Vg/8lKNX8RMBcFFHVMzBF8/PclMx8hWdg9UXLRO8/HhNLQZKAbC8C3E0 FPR1CuSGh9raEf1dpTCAlvpHEnitxuvTdjQY0pN9h76AHf/PZOa48SjGXJ9Yw6plZ/KlJ9R7K UxIkK7WkrSgU7tkG0UVWzWihLaTFFaeYHa9Fn9wKCkaHqsLH+8M8DnvIQUemp68DenV2OkgDQ CjJFYDlUyyFqkiZEs6APVrk1E0dyP4j5wZFUpXJAzlR7rk093Ir6dpfR0nDPO5CzHGJ1/wdO5 xTivvPWjDe4+sMeBIk1bvS1D9xDcIo7vKWNnmg== 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] [PULL 1/1] m68k: fix exception stack frame for 68000 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: Laurent Vivier , Pavel Dovgalyuk 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" From: Pavel Dovgalyuk 68000 CPUs do not save format in the exception stack frame. This patch adds feature checking to prevent format saving for 68000. m68k_ret() already includes this modification, this patch fixes the exception processing function too. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Laurent Vivier Message-Id: <20180413133041.29509.59064.stgit@pasha-VirtualBox> Signed-off-by: Laurent Vivier --- target/m68k/op_helper.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 3a7f7f2219..8d09ed91c4 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -287,22 +287,25 @@ static inline void do_stack_frame(CPUM68KState *env, = uint32_t *sp, uint16_t format, uint16_t sr, uint32_t addr, uint32_t retaddr) { - CPUState *cs =3D CPU(m68k_env_get_cpu(env)); - switch (format) { - case 4: - *sp -=3D 4; - cpu_stl_kernel(env, *sp, env->pc); - *sp -=3D 4; - cpu_stl_kernel(env, *sp, addr); - break; - case 3: - case 2: - *sp -=3D 4; - cpu_stl_kernel(env, *sp, addr); - break; + if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) { + /* all except 68000 */ + CPUState *cs =3D CPU(m68k_env_get_cpu(env)); + switch (format) { + case 4: + *sp -=3D 4; + cpu_stl_kernel(env, *sp, env->pc); + *sp -=3D 4; + cpu_stl_kernel(env, *sp, addr); + break; + case 3: + case 2: + *sp -=3D 4; + cpu_stl_kernel(env, *sp, addr); + break; + } + *sp -=3D 2; + cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << = 2)); } - *sp -=3D 2; - cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << 2)); *sp -=3D 4; cpu_stl_kernel(env, *sp, retaddr); *sp -=3D 2; --=20 2.14.3