From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F1C9C433E0 for ; Tue, 30 Jun 2020 21:22:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1269420663 for ; Tue, 30 Jun 2020 21:22:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1269420663 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqNhX-0003DS-3i for qemu-devel@archiver.kernel.org; Tue, 30 Jun 2020 17:21:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqNgd-0002k2-5X for qemu-devel@nongnu.org; Tue, 30 Jun 2020 17:21:03 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:49399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqNgb-0000UP-8J for qemu-devel@nongnu.org; Tue, 30 Jun 2020 17:21:02 -0400 Received: from [192.168.100.1] ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue109 [213.165.67.119]) with ESMTPSA (Nemesis) id 1Mf0Jg-1j9uFv23VS-00gXuO; Tue, 30 Jun 2020 23:20:57 +0200 To: Mark Cave-Ayland , qemu-devel@nongnu.org References: <20200630112752.31134-1-mark.cave-ayland@ilande.co.uk> <20200630112752.31134-3-mark.cave-ayland@ilande.co.uk> From: Laurent Vivier Autocrypt: addr=laurent@vivier.eu; prefer-encrypt=mutual; keydata= mQINBFYFJhkBEAC2me7w2+RizYOKZM+vZCx69GTewOwqzHrrHSG07MUAxJ6AY29/+HYf6EY2 WoeuLWDmXE7A3oJoIsRecD6BXHTb0OYS20lS608anr3B0xn5g0BX7es9Mw+hV/pL+63EOCVm SUVTEQwbGQN62guOKnJJJfphbbv82glIC/Ei4Ky8BwZkUuXd7d5NFJKC9/GDrbWdj75cDNQx UZ9XXbXEKY9MHX83Uy7JFoiFDMOVHn55HnncflUncO0zDzY7CxFeQFwYRbsCXOUL9yBtqLer Ky8/yjBskIlNrp0uQSt9LMoMsdSjYLYhvk1StsNPg74+s4u0Q6z45+l8RAsgLw5OLtTa+ePM JyS7OIGNYxAX6eZk1+91a6tnqfyPcMbduxyBaYXn94HUG162BeuyBkbNoIDkB7pCByed1A7q q9/FbuTDwgVGVLYthYSfTtN0Y60OgNkWCMtFwKxRaXt1WFA5ceqinN/XkgA+vf2Ch72zBkJL RBIhfOPFv5f2Hkkj0MvsUXpOWaOjatiu0fpPo6Hw14UEpywke1zN4NKubApQOlNKZZC4hu6/ 8pv2t4HRi7s0K88jQYBRPObjrN5+owtI51xMaYzvPitHQ2053LmgsOdN9EKOqZeHAYG2SmRW LOxYWKX14YkZI5j/TXfKlTpwSMvXho+efN4kgFvFmP6WT+tPnwARAQABtCJMYXVyZW50IFZp dmllciA8bGF1cmVudEB2aXZpZXIuZXU+iQI4BBMBAgAiBQJWBTDeAhsDBgsJCAcDAgYVCAIJ CgsEFgIDAQIeAQIXgAAKCRDzDDi9Py++PCEdD/oD8LD5UWxhQrMQCsUgLlXCSM7sxGLkwmmF ozqSSljEGRhffxZvO35wMFcdX9Z0QOabVoFTKrT04YmvbjsErh/dP5zeM/4EhUByeOS7s6Yl HubMXVQTkak9Wa9Eq6irYC6L41QNzz/oTwNEqL1weV1+XC3TNnht9B76lIaELyrJvRfgsp9M rE+PzGPo5h7QHWdL/Cmu8yOtPLa8Y6l/ywEJ040IoiAUfzRoaJs2csMXf0eU6gVBhCJ4bs91 jtWTXhkzdl4tdV+NOwj3j0ukPy+RjqeL2Ej+bomnPTOW8nAZ32dapmu7Fj7VApuQO/BSIHyO NkowMMjB46yohEepJaJZkcgseaus0x960c4ua/SUm/Nm6vioRsxyUmWd2nG0m089pp8LPopq WfAk1l4GciiMepp1Cxn7cnn1kmG6fhzedXZ/8FzsKjvx/aVeZwoEmucA42uGJ3Vk9TiVdZes lqMITkHqDIpHjC79xzlWkXOsDbA2UY/P18AtgJEZQPXbcrRBtdSifCuXdDfHvI+3exIdTpvj BfbgZAar8x+lcsQBugvktlQWPfAXZu4Shobi3/mDYMEDOE92dnNRD2ChNXg2IuvAL4OW40wh gXlkHC1ZgToNGoYVvGcZFug1NI+vCeCFchX+L3bXyLMg3rAfWMFPAZLzn42plIDMsBs+x2yP +bkCDQRWBSYZARAAvFJBFuX9A6eayxUPFaEczlMbGXugs0mazbOYGlyaWsiyfyc3PStHLFPj rSTaeJpPCjBJErwpZUN4BbpkBpaJiMuVO6egrC8Xy8/cnJakHPR2JPEvmj7Gm/L9DphTcE15 92rxXLesWzGBbuYxKsj8LEnrrvLyi3kNW6B5LY3Id+ZmU8YTQ2zLuGV5tLiWKKxc6s3eMXNq wrJTCzdVd6ThXrmUfAHbcFXOycUyf9vD+s+WKpcZzCXwKgm7x1LKsJx3UhuzT8ier1L363RW ZaJBZ9CTPiu8R5NCSn9V+BnrP3wlFbtLqXp6imGhazT9nJF86b5BVKpF8Vl3F0/Y+UZ4gUwL d9cmDKBcmQU/JaRUSWvvolNu1IewZZu3rFSVgcpdaj7F/1aC0t5vLdx9KQRyEAKvEOtCmP4m 38kU/6r33t3JuTJnkigda4+Sfu5kYGsogeYG6dNyjX5wpK5GJIJikEhdkwcLM+BUOOTi+I9u tX03BGSZo7FW/J7S9y0l5a8nooDs2gBRGmUgYKqQJHCDQyYut+hmcr+BGpUn9/pp2FTWijrP inb/Pc96YDQLQA1q2AeAFv3Rx3XoBTGl0RCY4KZ02c0kX/dm3eKfMX40XMegzlXCrqtzUk+N 8LeipEsnOoAQcEONAWWo1HcgUIgCjhJhBEF0AcELOQzitbJGG5UAEQEAAYkCHwQYAQIACQUC VgUmGQIbDAAKCRDzDDi9Py++PCD3D/9VCtydWDdOyMTJvEMRQGbx0GacqpydMEWbE3kUW0ha US5jz5gyJZHKR3wuf1En/3z+CEAEfP1M3xNGjZvpaKZXrgWaVWfXtGLoWAVTfE231NMQKGoB w2Dzx5ivIqxikXB6AanBSVpRpoaHWb06tPNxDL6SVV9lZpUn03DSR6gZEZvyPheNWkvz7bE6 FcqszV/PNvwm0C5Ju7NlJA8PBAQjkIorGnvN/vonbVh5GsRbhYPOc/JVwNNr63P76rZL8Gk/ hb3xtcIEi5CCzab45+URG/lzc6OV2nTj9Lg0SNcRhFZ2ILE3txrmI+aXmAu26+EkxLLfqCVT ohb2SffQha5KgGlOSBXustQSGH0yzzZVZb+HZPEvx6d/HjQ+t9sO1bCpEgPdZjyMuuMp9N1H ctbwGdQM2Qb5zgXO+8ZSzwC+6rHHIdtcB8PH2j+Nd88dVGYlWFKZ36ELeZxD7iJflsE8E8yg OpKgu3nD0ahBDqANU/ZmNNarBJEwvM2vfusmNnWm3QMIwxNuJghRyuFfx694Im1js0ZY3LEU JGSHFG4ZynA+ZFUPA6Xf0wHeJOxGKCGIyeKORsteIqgnkINW9fnKJw2pgk8qHkwVc3Vu+wGS ZiJK0xFusPQehjWTHn9WjMG1zvQ5TQQHxau/2FkP45+nRPco6vVFQe8JmgtRF8WFJA== Subject: Re: [PATCH v3 2/2] target/m68k: consolidate physical translation offset into get_physical_address() Message-ID: <3da2bd06-b7fe-5b02-d35a-d57edc1a7989@vivier.eu> Date: Tue, 30 Jun 2020 23:20:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200630112752.31134-3-mark.cave-ayland@ilande.co.uk> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:ZY2hDJARYs/9sicgPvtSCy0vxKq8slU6CqFnB+vGXQzCYAKtQcX lorpiGZJ9HWzcnd8FX2w8UTUjPW/SoN/dJ5ps4BXLK7tAXo3RbiRf5jFCQ7+l3n23l+JSz4 3m4hJrBuyOgXrGN9dpoh6kkMD/3HsZlVqNn+ZNRoml3VE74KsjibzbM+YA3YhU4Caz+56kB ooRJMvYrIDJ47ebIpBQfQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:thVP2dZu5do=:L5252Oe4iMF7jUhTpj56wU plheKaxOuORvpnSdvM2UdvdG/uhtAYIQt3whNV7gg93Laa6WkHdq8mic9seMtRAX8cnWYCmu2 1InflihrgOHYvPJcGYpv6/v/sBcHLURrfwZTPA3qWa1dTnzQ2Inz8aSaQSR5BFTWSVMg0Fdny tY1gnTAI2159vhCIW8bVBXvNNw+WTD4xlPUDtEA0A+ceZaFX6E27nZJjPI1g7rNx7TsB40eXn uNZKWFap9pmZiTIZok3mIT8ifk4WvdqS/HnZjWcDOb/vCgaBRhCYwSN0vT6+oBQPBA0m7or3c OR10y1X4eoCvfplckDs0UYaY+iFB5zZWHjw109on9jM1GZ176iPP1iHETEDELUKsb/h+jUWkz W2XcG/cIJyDQjp14qs2KqpMRJPd/hq6vunvjtQdaO7pigs+ZWPnUa/wOfOG66Re98bi/pZrBr NFkl06FyJUKFGTA6t/lJU/9kWjZzbdlW9eDHjHvDn4mJndzVpAVJr6JwEqO/Rp5ZG0PKmCgNn ljh3c6mBmxW9y+j5ZsTEtMogL1Ud9PfjJOnHFecgSF36usUafbZG++8vpRBxKyGM5U9FYanBB cA3SOiMmc0GlVzqiuTRWWrBuCbCexUXXrYywxRujAXWP7kNIvlBBKfAM/MhEqgS+F6bNu0KkT uJTizAo0ku+iDRvD7rAyU+9KJFYsz8ykWa40Uda2yctRYYjnsDBYsfnBgUx6aGs49uFEfHpaI yumsv85nFleQ7g33DXKaKG6rqHMwnWTaxNSjVFPH8QKClR37H0/XuBRKTmLarFIrzVj/uwsvO qYBtC/saUWpwMgaQbLszF/8J/joriZiPgv5LBHNYtWc6R6cHpQ= Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/30 17:20:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_NONE=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Le 30/06/2020 à 13:27, Mark Cave-Ayland a écrit : > 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é > Signed-off-by: Mark Cave-Ayland > --- > target/m68k/helper.c | 18 +++++++----------- > 1 file changed, 7 insertions(+), 11 deletions(-) > > diff --git a/target/m68k/helper.c b/target/m68k/helper.c > index 631eab7774..71c2376910 100644 > --- a/target/m68k/helper.c > +++ b/target/m68k/helper.c > @@ -643,7 +643,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, > /* Transparent Translation Register bit */ > env->mmu.mmusr = M68K_MMU_T_040 | M68K_MMU_R_040; > } > - *physical = address & TARGET_PAGE_MASK; > + *physical = address; > *page_size = TARGET_PAGE_SIZE; > return 0; > } > @@ -771,7 +771,8 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, > } > *page_size = 1 << page_bits; > page_mask = ~(*page_size - 1); > - *physical = next & page_mask; > + address &= TARGET_PAGE_MASK; I don't think you need TARGET_PAGE_MASK here: - TARGET_PAGE_MASK is 4096 - page_mask is either 4096 or 8192 > + *physical = (next & page_mask) + (address & (*page_size - 1)); > > if (access_type & ACCESS_PTEST) { > env->mmu.mmusr |= next & M68K_MMU_SR_MASK_040; > @@ -826,8 +827,6 @@ hwaddr m68k_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) > return -1; > } > > - addr &= TARGET_PAGE_MASK; > - phys_addr += addr & (page_size - 1); > return phys_addr; > } > > @@ -891,10 +890,8 @@ bool m68k_cpu_tlb_fill(CPUState *cs, vaddr address, int size, > ret = get_physical_address(&cpu->env, &physical, &prot, > address, access_type, &page_size); > if (likely(ret == 0)) { > - address &= TARGET_PAGE_MASK; > - physical += address & (page_size - 1); > - tlb_set_page(cs, address, physical, > - prot, mmu_idx, TARGET_PAGE_SIZE); > + tlb_set_page(cs, address & TARGET_PAGE_MASK, > + physical & TARGET_PAGE_MASK, prot, mmu_idx, page_size); I had a look to tl_set_page() to see how it manages the entry when the addresses are not aligned to page_size, and it calls tlb_set_page_with_attrs() where we have a comment: /* Add a new TLB entry. At most one entry for a given virtual address * is permitted. Only a single TARGET_PAGE_SIZE region is mapped, the * supplied size is only used by tlb_flush_page. ... So I think it's correct to use TARGET_PAGE_MASK and page_size. Thanks, Laurent