From nobody Fri Apr 26 08:51:26 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1623247936; cv=none; d=zohomail.com; s=zohoarc; b=mxwXnbpB5tjlWIkRYPz+m6zijbkXyJlPWnaKf836WsX7a1FPBsLugGe8YKJ44caAwuU/QbCB06GO+w56OyW4IedeUZen6g/cZ71slWzJVNJQgQp5WOhC0yWfu3iHBocA+sgP3AnrNIcPX7Qh3l6UfLHGtYrzPKaAnI1Ah+vDawU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623247936; h=Content-Type: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=SK4Sda9oKAO+kAJdqn+QafWI9XvksejZSvmI3F9R0lo=; b=gp5Zx6dYvTiMT7xlv6KV+aX7T83uraWXrUahgONmGnb+/IEae6saKhZ6dKUp+d6LmDLOWBjf/6P/FBo9MISwKxBc7v9sxum1QFSsJ5uQg7jcEBKE1L8c9gBkqzt7YRtLm3iwI86KkoCKzwL+TNJZ1oPQXBIEUl/wCgmMUL/yppU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1623247936045357.8459768001453; Wed, 9 Jun 2021 07:12:16 -0700 (PDT) Received: from localhost ([::1]:50102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqywI-0006EH-WA for importer2@patchew.org; Wed, 09 Jun 2021 10:12:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqyuW-0003jq-Br for qemu-devel@nongnu.org; Wed, 09 Jun 2021 10:10:24 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:42685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqyuR-0006NJ-4G for qemu-devel@nongnu.org; Wed, 09 Jun 2021 10:10:24 -0400 Received: by mail-wm1-x332.google.com with SMTP id l7-20020a05600c1d07b02901b0e2ebd6deso4317834wms.1 for ; Wed, 09 Jun 2021 07:10:18 -0700 (PDT) Received: from x1w.redhat.com (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id j12sm24258wrt.69.2021.06.09.07.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 07:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SK4Sda9oKAO+kAJdqn+QafWI9XvksejZSvmI3F9R0lo=; b=ThhnxJXqlKNpUl5qYUi6A0MSXeZgFTHQMckiI4DPHkoeqz7qS8usBhZ8su0vGTZ2iF FODzMTSK7RdUBKP+NaxESlyOILQTRZsRo5lBMyIXa6xzvse/9nK56d7A4wqjgE5ckzlN t/8paIt1g9D1UUbGh0o2A65Dj7d/zLnMetFCKhXAokFYFPG/bGbKtKhJPCa2e4tHArxe WQ421EjaxNRBhZoZV/GU0p39CrKPkDnJHVZDyIXXghvyn1L2BkAehhKcANcyac9955gy uYozoC89NtM/romJsw8tDT7du/eO1wmNo5urq4gY4BPJBoeLrujgmT6zgx/TL02vuUOl 7dhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SK4Sda9oKAO+kAJdqn+QafWI9XvksejZSvmI3F9R0lo=; b=dfc77Q9XbMsjpKzLWydypw7E/TRnJ1QKHYs+MIyfe31wLTtsmJLE8yDoQqxZphIeNl MRwLXSZ1PeZvPggWWFXnzZ9PrAXs7rmSIClCO55WnmT9OHAUEqOpw4ilZM8o15nZrxG2 TsZ5gcAicmCk179CeMJLmx85V8DXp3ZKIWtsgJ1TMopCi1MbNh8l8CRebFLnuhsTG1vh Y4JjOzS7gQL/OvcFjlb0du89VItkkoLtzS7lsDu2DSxBm2GNu4cUXCdCI+Hpp28Dvac6 PDRfgi8BTb4iGB+7hE++ECaLEr8Vx7WcThmNbzfqpUDOJzqvprsnYehIZ7p56+y9e6wH WFbw== X-Gm-Message-State: AOAM531HWsfJdBQdf8gBeH78PrpP4mOX+O3gCvHzgHEX5bQMyOtKLYcB zk/vPY6d00L2em5KpbBDtVSz9l0edBfxyw== X-Google-Smtp-Source: ABdhPJxxYSgNV6WU1qc3iTRGMNfGLj5hPfnTOD1rGGyzO0/Xjn03K5FFl2GPQtIdhU6MiAFnPyey5w== X-Received: by 2002:a05:600c:35c3:: with SMTP id r3mr10033186wmq.169.1623247816991; Wed, 09 Jun 2021 07:10:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] accel/tcg/cputlb: Extract load_helper_unaligned() from load_helper() Date: Wed, 9 Jun 2021 16:10:09 +0200 Message-Id: <20210609141010.1066750-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210609141010.1066750-1-f4bug@amsat.org> References: <20210609141010.1066750-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell , Richard Henderson , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Replace a goto statement by an inlined function for easier review. No logical change intended. Inspired-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/tcg/cputlb.c | 54 ++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index f24348e9793..2b5d569412c 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1851,6 +1851,34 @@ load_memop(const void *haddr, MemOp op) } } =20 +static inline uint64_t QEMU_ALWAYS_INLINE +load_helper_unaligned(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi, + uintptr_t retaddr, MemOp op, bool code_read, + FullLoadHelper *full_load) +{ + size_t size =3D memop_size(op); + target_ulong addr1, addr2; + uint64_t res; + uint64_t r1, r2; + unsigned shift; + + addr1 =3D addr & ~((target_ulong)size - 1); + addr2 =3D addr1 + size; + r1 =3D full_load(env, addr1, oi, retaddr); + r2 =3D full_load(env, addr2, oi, retaddr); + shift =3D (addr & (size - 1)) * 8; + + if (memop_big_endian(op)) { + /* Big-endian combine. */ + res =3D (r1 << shift) | (r2 >> ((size * 8) - shift)); + } else { + /* Little-endian combine. */ + res =3D (r1 >> shift) | (r2 << ((size * 8) - shift)); + } + + return res & MAKE_64BIT_MASK(0, size * 8); +} + static inline uint64_t QEMU_ALWAYS_INLINE load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi, uintptr_t retaddr, MemOp op, bool code_read, @@ -1866,7 +1894,6 @@ load_helper(CPUArchState *env, target_ulong addr, TCG= MemOpIdx oi, code_read ? MMU_INST_FETCH : MMU_DATA_LOAD; unsigned a_bits =3D get_alignment_bits(get_memop(oi)); void *haddr; - uint64_t res; size_t size =3D memop_size(op); =20 /* Handle CPU specific unaligned behaviour */ @@ -1893,9 +1920,10 @@ load_helper(CPUArchState *env, target_ulong addr, TC= GMemOpIdx oi, CPUIOTLBEntry *iotlbentry; bool need_swap; =20 - /* For anything that is unaligned, recurse through full_load. */ + /* For anything that is unaligned, recurse through byte loads. */ if ((addr & (size - 1)) !=3D 0) { - goto do_unaligned_access; + return load_helper_unaligned(env, addr, oi, retaddr, op, + code_read, full_load); } =20 iotlbentry =3D &env_tlb(env)->d[mmu_idx].iotlb[index]; @@ -1932,24 +1960,8 @@ load_helper(CPUArchState *env, target_ulong addr, TC= GMemOpIdx oi, if (size > 1 && unlikely((addr & ~TARGET_PAGE_MASK) + size - 1 >=3D TARGET_PAGE_SIZE)) { - target_ulong addr1, addr2; - uint64_t r1, r2; - unsigned shift; - do_unaligned_access: - addr1 =3D addr & ~((target_ulong)size - 1); - addr2 =3D addr1 + size; - r1 =3D full_load(env, addr1, oi, retaddr); - r2 =3D full_load(env, addr2, oi, retaddr); - shift =3D (addr & (size - 1)) * 8; - - if (memop_big_endian(op)) { - /* Big-endian combine. */ - res =3D (r1 << shift) | (r2 >> ((size * 8) - shift)); - } else { - /* Little-endian combine. */ - res =3D (r1 >> shift) | (r2 << ((size * 8) - shift)); - } - return res & MAKE_64BIT_MASK(0, size * 8); + return load_helper_unaligned(env, addr, oi, retaddr, op, + code_read, full_load); } =20 haddr =3D (void *)((uintptr_t)addr + entry->addend); --=20 2.31.1 From nobody Fri Apr 26 08:51:26 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1623247937; cv=none; d=zohomail.com; s=zohoarc; b=AfqbP7UcndCMLcc/6/C8896aPbHykOdXiJ8rbgkjqg516fdfOKPB/f15ZkUZzK56InXUiM6QoX8VGythR21C7p65b0vs/U2dI2CkXWAvDnMSpaOM/F+Dd4JYuX09o9A8H0S4E+WJNtXj+PoNi64gdy26SflzI//qvSNhYTo7yy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623247937; h=Content-Type: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=cuhVhtS4uB4qhQc1SbOfv31p5K7UypZDG5J1mCuh5mk=; b=CHhAuX+qSjDUIDC0J/dfIHuY5c991GB3S7pGErrpcSc7Bc9PpUEXwW3Xs4NhgPpVCYsPrKMFk8PIm9BDnPF0J24zAGpsc3sPR6jg3T7MF8PKLCMXoFeJ60fQ40cNcAq+I3VzzCOJ4seo38qE+3jIzgIa4b/w4OMsRQvPTw48E9I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1623247937336600.2449679934392; Wed, 9 Jun 2021 07:12:17 -0700 (PDT) Received: from localhost ([::1]:50176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqywK-0006HH-9Z for importer2@patchew.org; Wed, 09 Jun 2021 10:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqyuX-0003k1-8O for qemu-devel@nongnu.org; Wed, 09 Jun 2021 10:10:26 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:35438) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqyuV-0006QH-Dm for qemu-devel@nongnu.org; Wed, 09 Jun 2021 10:10:25 -0400 Received: by mail-wm1-x330.google.com with SMTP id k5-20020a05600c1c85b02901affeec3ef8so4435050wms.0 for ; Wed, 09 Jun 2021 07:10:23 -0700 (PDT) Received: from x1w.redhat.com (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id o129sm6840928wmo.22.2021.06.09.07.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 07:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cuhVhtS4uB4qhQc1SbOfv31p5K7UypZDG5J1mCuh5mk=; b=PABDiovBdnW5xAST3wfDXOSnd/vSEZPzNTAKz9pih1Gt9HRvcgXaCADnqaYXtT1Mbr vas6GtpG1kvFqlrESMr+ZBhSb+qwY09/Q9k9zlaT+zb0Gr9kuShc6AVOPO4DoroWzKWe OIw+cZupY6tpyiAYhI5l0ugr7zj9vXTjBv2V/oPwy/lbMq/Q0Krw0qe5PND5GOYUBbuZ 22IMgYSMyi98R7n9uhHXpG60z4mqK73iGTcM4CPcHJh+hxj5ZM+GiT6OjLaZBJ0hdNPN yLO4Z4NdcuyMyiAPTdDw/g5vlqNwe+0+MmTymp/B4qxo8GlxuDzfwPOJ4o+ck4YhHuxM HDlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cuhVhtS4uB4qhQc1SbOfv31p5K7UypZDG5J1mCuh5mk=; b=jg8ObvZBa9wvWkyMkQMv9sco9xfEuPqd4jdd4mkdbFYbA26m9rHzEvme+YZT/dlF9U DYw05jwqlpQLkckGdzguzFGjaY3XJEN1q9A96xT1HkeAghKw/zSsKcf3b7OB+Sy0LvVd JX0R914CJdBZtc6zHzpkyE5F6tK1TFW+epOVwXZwfUc+4Fd0RzcV5V/A6DXpCKY3urEC qzZH6LVEpmcCZ1IkcaUAyEOpZ5gi+Rkt0+2+rhLZqXCm9CMT4fLmxidPQWRUNutD4Ufu 8eeqyf3n6FjcR+a+vV+vzQv5JknatfFojrXW1qQfEU4eyd444NFYkHqeiBjFTmU3WOk4 Wy1w== X-Gm-Message-State: AOAM533zCu+Fr8xkIEa6pf09l80zkDcGYxZtTZnSbCRsHqBhiswD7/kO TPqoBpz4znss9EHKA377DDoKpz2vFSZ/Bw== X-Google-Smtp-Source: ABdhPJwi4ZIsuG2y9uz+H+2a4Le3wnz7iXU5lYDa7AjNoPzF00nG5e14uqIUDFpdcq9VNTTKDkpiMg== X-Received: by 2002:a1c:f60f:: with SMTP id w15mr10052226wmc.5.1623247821792; Wed, 09 Jun 2021 07:10:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 2/2] cputlb: implement load_helper_unaligned() for unaligned loads Date: Wed, 9 Jun 2021 16:10:10 +0200 Message-Id: <20210609141010.1066750-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210609141010.1066750-1-f4bug@amsat.org> References: <20210609141010.1066750-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell , Richard Henderson , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Mark Cave-Ayland [RFC because this is currently only lightly tested and there have been some discussions about whether this should be handled elsewhere in the memory AP= I] If an unaligned load is required then the load is split into 2 separate acc= esses and combined together within load_helper(). This does not work correctly wi= th MMIO accesses because the original access size is used for both individual accesses causing the little and big endian combine to return the wrong resu= lt. There is already a similar solution in place for store_helper() where an un= aligned access is handled by a separate store_helper_unaligned() function which ins= tead of using the original access size, uses a single-byte access size to shift = and combine the result correctly regardless of the orignal access size or endia= n. Implement a similar load_helper_unaligned() function which uses the same ap= proach for unaligned loads to return the correct result according to the original = test case. Signed-off-by: Mark Cave-Ayland Resolves: https://gitlab.com/qemu-project/qemu/-/issues/360 Message-Id: <20210609093528.9616-1-mark.cave-ayland@ilande.co.uk> [PMD: Extract load_helper_unaligned() in earlier patch] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/tcg/cputlb.c | 84 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 16 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 2b5d569412c..f8a790d8b4a 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1856,27 +1856,79 @@ load_helper_unaligned(CPUArchState *env, target_ulo= ng addr, TCGMemOpIdx oi, uintptr_t retaddr, MemOp op, bool code_read, FullLoadHelper *full_load) { + uintptr_t mmu_idx =3D get_mmuidx(oi); size_t size =3D memop_size(op); - target_ulong addr1, addr2; - uint64_t res; - uint64_t r1, r2; - unsigned shift; + uintptr_t index, index2; + CPUTLBEntry *entry, *entry2; + const size_t tlb_off =3D code_read ? + offsetof(CPUTLBEntry, addr_code) : offsetof(CPUTLBEntry, addr_read= ); + const MMUAccessType access_type =3D + code_read ? MMU_INST_FETCH : MMU_DATA_LOAD; + target_ulong page2, tlb_addr, tlb_addr2; + uint64_t val =3D 0; + size_t size2; + int i; =20 - addr1 =3D addr & ~((target_ulong)size - 1); - addr2 =3D addr1 + size; - r1 =3D full_load(env, addr1, oi, retaddr); - r2 =3D full_load(env, addr2, oi, retaddr); - shift =3D (addr & (size - 1)) * 8; + /* + * Ensure the second page is in the TLB. Note that the first page + * is already guaranteed to be filled, and that the second page + * cannot evict the first. + */ + page2 =3D (addr + size) & TARGET_PAGE_MASK; + size2 =3D (addr + size) & ~TARGET_PAGE_MASK; + index2 =3D tlb_index(env, mmu_idx, page2); + entry2 =3D tlb_entry(env, mmu_idx, page2); =20 - if (memop_big_endian(op)) { - /* Big-endian combine. */ - res =3D (r1 << shift) | (r2 >> ((size * 8) - shift)); - } else { - /* Little-endian combine. */ - res =3D (r1 >> shift) | (r2 << ((size * 8) - shift)); + tlb_addr2 =3D code_read ? entry2->addr_code : entry2->addr_read; + if (!tlb_hit_page(tlb_addr2, page2)) { + if (!victim_tlb_hit(env, mmu_idx, index2, tlb_off, page2)) { + tlb_fill(env_cpu(env), page2, size2, access_type, + mmu_idx, retaddr); + index2 =3D tlb_index(env, mmu_idx, page2); + entry2 =3D tlb_entry(env, mmu_idx, page2); + } + tlb_addr2 =3D code_read ? entry2->addr_code : entry2->addr_read; } =20 - return res & MAKE_64BIT_MASK(0, size * 8); + index =3D tlb_index(env, mmu_idx, addr); + entry =3D tlb_entry(env, mmu_idx, addr); + tlb_addr =3D code_read ? entry->addr_code : entry->addr_read; + + /* + * Handle watchpoints + */ + if (unlikely(tlb_addr & TLB_WATCHPOINT)) { + cpu_check_watchpoint(env_cpu(env), addr, size - size2, + env_tlb(env)->d[mmu_idx].iotlb[index].attrs, + BP_MEM_READ, retaddr); + } + if (unlikely(tlb_addr2 & TLB_WATCHPOINT)) { + cpu_check_watchpoint(env_cpu(env), page2, size2, + env_tlb(env)->d[mmu_idx].iotlb[index2].attrs, + BP_MEM_READ, retaddr); + } + + /* + * XXX: not efficient, but simple. + * This loop must go in the forward direction to avoid issues + * with self-modifying code in Windows 64-bit. + */ + oi =3D make_memop_idx(MO_UB, mmu_idx); + if (memop_big_endian(op)) { + for (i =3D 0; i < size; ++i) { + /* Big-endian load. */ + uint8_t val8 =3D helper_ret_ldub_mmu(env, addr + i, oi, retadd= r); + val |=3D val8 << (((size - 1) * 8) - (i * 8)); + } + } else { + for (i =3D 0; i < size; ++i) { + /* Little-endian load. */ + uint8_t val8 =3D helper_ret_ldub_mmu(env, addr + i, oi, retadd= r); + val |=3D val8 << (i * 8); + } + } + + return val & MAKE_64BIT_MASK(0, size * 8); } =20 static inline uint64_t QEMU_ALWAYS_INLINE --=20 2.31.1