From nobody Wed Feb 11 00:59:09 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615497310; cv=none; d=zohomail.com; s=zohoarc; b=HByPp37w61RxzpyyOf3ohT+0ea/qpqneEmNEQRXkibDEfr1SWE6WH8N/M32VQzR64ERGtR9mA5DAnl7J2VMsez84BQD2kZSOMU01ZbsmMHbjHnTV5oWQSRvbpkpD0iShtcW86xA9O/+Nxv3VTMXCx3ZFJNx7Wu0LhOmINyaQwAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615497310; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TbnTFshjIFgj5YmVr3kLMDoMDYUOqpq5IgXXL+oaJu4=; b=k9oaPvNfrfi8eKP0MXOqnYiJkHmfZPEaLSfrEMM4Jhapt1RShVgj9UeNjQYNuuUOBwZzn6COUGHm61mblkg87BSmezi5NAfeggeg7J1aJsEeQ/0mtZQifUn7ZEaoQI3Gab4dSlqYPH0fox/kOkIa0gVb4txmV7I82FjPmxIt0cE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615497310785894.555813648894; Thu, 11 Mar 2021 13:15:10 -0800 (PST) Received: from localhost ([::1]:47692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKSeD-000562-Qc for importer@patchew.org; Thu, 11 Mar 2021 16:15:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKSYy-0006bv-V5 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 16:09:45 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:54131) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKSYw-0004xr-Cx for qemu-devel@nongnu.org; Thu, 11 Mar 2021 16:09:44 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N4i3d-1lldrf1GNT-011hsV; Thu, 11 Mar 2021 22:09:40 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/9] target/m68k: add M68K_FEATURE_UNALIGNED_DATA feature Date: Thu, 11 Mar 2021 22:09:29 +0100 Message-Id: <20210311210934.1935587-5-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210311210934.1935587-1-laurent@vivier.eu> References: <20210311210934.1935587-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ZmKagHLy5yAoXzTTIYZc4qWkGeOV/lHRoHAr9M+imcANBCizrWq i0v1mWkBMYV+ZNAEJHjs9ap4YI/H/j4dZJy4Fe4u4X4FL+mcE9HSq2pfiH8gRYiILtZkHh6 Givkl0cKsuokfFoiHE6gFSvlYFyiBYpilchvMovm1olnQXFG7OgbT2L9BBlhtZNg0qh5wWL A71zfHSeVRonGldLYTbsQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:GyYSxtjEftc=:1dz21aK63cnJb0KSJmHfFz P2cEQcgUJFMEuoea8b6znWatSphDn4bYlJa60yiZc7w9VYSl1cICd/ErbqTrgVwE3o8eUCpU2 /C1j8BM+SD3yOgItsVNm0ME3DE/Bf0g6rthUVdXZljS2xz7i/obIp1W76yAYHHn3Q52ka26Gj OmmY0UeXQqhVDC3y+GoPheS+P5j33/tYelilPGf9AAQi0w1Wc4VhDf4DeB6vR8+R9VsggRcTw EBExETEktQ4sivoSw5CpbBTFtiONTroDhtdy2JbbsjSKv67EvnN34uuQgTXSsR5R7sIO2hu1t xUmgrifUCu/kUjjt9oB6A2KENhUNqqh9U86rLSLjO6BjV3QrW/1u8vtXNktgCR5gJwcLQg8fG SB1TVg7qeY+okXGOYolM/e2blIYBZlKLUljSAJ+JPMn0+Esd0g3+X879uf41zh7E3oKNRlPqI GOKLLoaZJQ== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=212.227.17.13; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Mark Cave-Ayland , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland According to the M68040UM Appendix D the requirement for data accesses to be word aligned is only for the 68000, 68008 and 68010 CPUs. Later CPUs from t= he 68020 onwards will allow unaligned data accesses but at the cost of being l= ess efficient. Add a new M68K_FEATURE_UNALIGNED_DATA feature to specify that data accesses= are not required to be word aligned, and don't perform the alignment on the sta= ck pointer when taking an exception if this feature is not selected. This is required because the MacOS DAFB driver attempts to call an A-trap with a byte-aligned stack pointer during initialisation and without this the stack pointer is off by one when the A-trap returns. Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson Message-Id: <20210308121155.2476-4-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier --- target/m68k/cpu.h | 2 ++ target/m68k/cpu.c | 1 + target/m68k/op_helper.c | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index ce558e9b03e7..402c86c8769e 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -527,6 +527,8 @@ enum m68k_features { M68K_FEATURE_MOVEP, /* MOVEC insn. (from 68010) */ M68K_FEATURE_MOVEC, + /* Unaligned data accesses (680[2346]0) */ + M68K_FEATURE_UNALIGNED_DATA, }; =20 static inline int m68k_feature(CPUM68KState *env, int feature) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 37d2ed9dc79c..a14874b4da28 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -161,6 +161,7 @@ static void m68020_cpu_initfn(Object *obj) m68k_set_feature(env, M68K_FEATURE_CAS); m68k_set_feature(env, M68K_FEATURE_CHK2); m68k_set_feature(env, M68K_FEATURE_MSP); + m68k_set_feature(env, M68K_FEATURE_UNALIGNED_DATA); } =20 /* diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 5f981e5bf628..46ff81acc9f5 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -348,7 +348,10 @@ static void m68k_interrupt_all(CPUM68KState *env, int = is_hw) cpu_m68k_set_sr(env, sr); sp =3D env->aregs[7]; =20 - sp &=3D ~1; + if (!m68k_feature(env, M68K_FEATURE_UNALIGNED_DATA)) { + sp &=3D ~1; + } + if (cs->exception_index =3D=3D EXCP_ACCESS) { if (env->mmu.fault) { cpu_abort(cs, "DOUBLE MMU FAULT\n"); --=20 2.29.2