From nobody Fri Apr 26 18:53:46 2024 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=1593497521; cv=none; d=zohomail.com; s=zohoarc; b=RdA2X9dyTgnZMiVnE02w778Ca9ln40QJ3OBU7b9WivL8j5X0vcmzkUQHamhcBp+T+Howlc87UjtvSotACiH/AdkH9ybmKltSkW/3W7+cPyxNZwmHA0gmPpQYi/tFWlLjUrxCv2VMmy7iVvxOt1uHP4nFla9N+j3bezpfQYV0Ymg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593497521; h=Content-Type:Content-Transfer-Encoding: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=6DCa//5Ny4Ozgd7OKHv2VyCWcbhJ7drnuMKT1dFrLFU=; b=TTiSBnEQkD3aWnwAtiCVZ6TAtzP/GJC44nBYeY396KToyhnOhgy1/MywXjwdl1+vdhec0DtnEIbRXf7piTsq0kQPLFD6hyi/cwQGQ2o93rVDZFvSDiNmc+vS7BS7mBCB5/M9Jq9n/SlVrdS3lkaXYcOwF/Sk0ImGBBy4YSdLZbU= 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 159349752191577.86216036577139; Mon, 29 Jun 2020 23:12:01 -0700 (PDT) Received: from localhost ([::1]:45976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq9Uu-0002mx-L5 for importer@patchew.org; Tue, 30 Jun 2020 02:12:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq9Tq-0001wx-Sh for qemu-devel@nongnu.org; Tue, 30 Jun 2020 02:10:54 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:40438 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq9To-0001uF-Sv for qemu-devel@nongnu.org; Tue, 30 Jun 2020 02:10:54 -0400 Received: from host86-182-221-235.range86-182.btcentralplus.com ([86.182.221.235] helo=kentang.int.eigen-ltd.com) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jq9Tp-0006sP-Vc; Tue, 30 Jun 2020 07:10:58 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, laurent@vivier.eu Date: Tue, 30 Jun 2020 07:10:35 +0100 Message-Id: <20200630061036.7526-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200630061036.7526-1-mark.cave-ayland@ilande.co.uk> References: <20200630061036.7526-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.182.221.235 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 1/2] target/m68k: fix physical address translation in m68k_cpu_get_phys_page_debug() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" The result of the get_physical_address() function should be combined with t= he offset of the original page access before being returned. Otherwise the m68k_cpu_get_phys_page_debug() function can round to the wrong page causing incorrect lookups in gdbstub and various "Disassembler disagrees with translator over instruction decoding" warnings to appear at translation tim= e. Fixes: 88b2fef6c3 ("target/m68k: add MC68040 MMU") Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- target/m68k/helper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 79b0b10ea9..631eab7774 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -820,10 +820,14 @@ hwaddr m68k_cpu_get_phys_page_debug(CPUState *cs, vad= dr addr) if (env->sr & SR_S) { access_type |=3D ACCESS_SUPER; } + if (get_physical_address(env, &phys_addr, &prot, addr, access_type, &page_size) !=3D 0) { return -1; } + + addr &=3D TARGET_PAGE_MASK; + phys_addr +=3D addr & (page_size - 1); return phys_addr; } =20 --=20 2.20.1 From nobody Fri Apr 26 18:53:46 2024 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=1593497611; cv=none; d=zohomail.com; s=zohoarc; b=AQIXASjrSM5sEHzKmRakhTbdN/Oz2aN++VARmFrRRfgyjt6pz+dLCYCFPEl+VFCtE3CT7WhHI9h00bvip1C42zes4BQ62P4TvFnfk/WpJrIC//3Zo+wahA84vLtVVZsA8d+RfBVfMMGxM1bWcyRDBClVc4/SaV+pkYnaiGCyUYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593497611; h=Content-Type:Content-Transfer-Encoding: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=YbgH9Lq9EUvSjrogs2qY0+15FLMWhF5pdI781GT6og4=; b=mssKox/l+RmKA4zM/r3fldNSUgsw4VV2bl0xiLwD/1jx972/TUsHAfGPA5IIUF/zEblVaZ12ihD2chxd1vpGj0SlqHKoch41NYeL4tWRjzhtXByb/PaLsaaINXIc9njE708Asbin6r5Z9XLiUDPIC89pPwKqii6LuaXV0/7n/Vk= 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 1593497611786141.58900300788855; Mon, 29 Jun 2020 23:13:31 -0700 (PDT) Received: from localhost ([::1]:49168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq9WM-00048A-Kr for importer@patchew.org; Tue, 30 Jun 2020 02:13:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq9Tu-000219-3Z for qemu-devel@nongnu.org; Tue, 30 Jun 2020 02:10:58 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:40442 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq9Ts-0001uV-Ie for qemu-devel@nongnu.org; Tue, 30 Jun 2020 02:10:57 -0400 Received: from host86-182-221-235.range86-182.btcentralplus.com ([86.182.221.235] helo=kentang.int.eigen-ltd.com) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jq9Tu-0006sP-5b; Tue, 30 Jun 2020 07:11:01 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, laurent@vivier.eu Date: Tue, 30 Jun 2020 07:10:36 +0100 Message-Id: <20200630061036.7526-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200630061036.7526-1-mark.cave-ayland@ilande.co.uk> References: <20200630061036.7526-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.182.221.235 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 2/2] target/m68k: consolidate physical translation offset into get_physical_address() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Since all callers to get_physical_address() now apply the same page offset = to the translation result, move the logic into get_physical_address() itself to avoid duplication. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Mark Cave-Ayland --- target/m68k/helper.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 631eab7774..ddd8a2667e 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -771,7 +771,8 @@ static int get_physical_address(CPUM68KState *env, hwad= dr *physical, } *page_size =3D 1 << page_bits; page_mask =3D ~(*page_size - 1); - *physical =3D next & page_mask; + address &=3D TARGET_PAGE_MASK; + *physical =3D (next & page_mask) + (address & (*page_size - 1)); =20 if (access_type & ACCESS_PTEST) { env->mmu.mmusr |=3D next & M68K_MMU_SR_MASK_040; @@ -826,8 +827,6 @@ hwaddr m68k_cpu_get_phys_page_debug(CPUState *cs, vaddr= addr) return -1; } =20 - addr &=3D TARGET_PAGE_MASK; - phys_addr +=3D addr & (page_size - 1); return phys_addr; } =20 @@ -891,10 +890,7 @@ bool m68k_cpu_tlb_fill(CPUState *cs, vaddr address, in= t size, ret =3D get_physical_address(&cpu->env, &physical, &prot, address, access_type, &page_size); if (likely(ret =3D=3D 0)) { - address &=3D TARGET_PAGE_MASK; - physical +=3D address & (page_size - 1); - tlb_set_page(cs, address, physical, - prot, mmu_idx, TARGET_PAGE_SIZE); + tlb_set_page(cs, address, physical, prot, mmu_idx, page_size); return true; } =20 @@ -1383,8 +1379,6 @@ void HELPER(ptest)(CPUM68KState *env, uint32_t addr, = uint32_t is_read) ret =3D get_physical_address(env, &physical, &prot, addr, access_type, &page_size); if (ret =3D=3D 0) { - addr &=3D TARGET_PAGE_MASK; - physical +=3D addr & (page_size - 1); tlb_set_page(env_cpu(env), addr, physical, prot, access_type & ACCESS_SUPER ? MMU_KERNEL_IDX : MMU_USER_IDX, page_size); --=20 2.20.1