From nobody Sun Nov 24 12:50:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1724107977; cv=none; d=zohomail.com; s=zohoarc; b=cRJm+d7I38J8O/ABglXFoV6JC+q5FhiwhX6nBXPcygftuO3F1DPqPnmKQw7EzcRnTtGI0yFjO6QSn8M9988ukSEiUDvv19CtBHpMhtpREgO2e9Xyjv6ZZrCYyTWLGMaN3VaUYV7ilh+GZ3LQaExKhDR9FRXW5NTEuPLmxIHYQXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724107977; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=i7OiajvUnedKpMidKrs6amtZmafu3g3RvoaYWNpbOxM=; b=Nof7mQOamWqnVpkOk+TIJXFw2CTKYoyM015AqyZuDIUHZ9W/qbs4wY5t2tUlxIAzbDnfTlq+XJ1hAcAG3P3n2vzmqJ2ahDttl3FW70GOo9aByxV/8/e0tZguw5vTq5KgctDAYBXiA9AyIwE+mIz1XZq40pYN3GQ6tJQ5jm+F/Jw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1724107977161679.2866413616888; Mon, 19 Aug 2024 15:52:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sgBEx-0001pS-4r; Mon, 19 Aug 2024 18:52:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sgBE0-0000Sv-Se for qemu-devel@nongnu.org; Mon, 19 Aug 2024 18:51:47 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sgBDx-0000gP-MF for qemu-devel@nongnu.org; Mon, 19 Aug 2024 18:51:43 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-37182eee02dso2551176f8f.1 for ; Mon, 19 Aug 2024 15:51:39 -0700 (PDT) Received: from localhost.localdomain (88-178-97-237.subs.proxad.net. [88.178.97.237]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37189896bf0sm11537030f8f.73.2024.08.19.15.51.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 Aug 2024 15:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724107898; x=1724712698; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i7OiajvUnedKpMidKrs6amtZmafu3g3RvoaYWNpbOxM=; b=ytpHSYRW+xglkcWV22WOLrlTASBcRUqjsdkYxqkBJAhYlGRj7moZx4O/mQRHMwv0KD M2UKbde9TfKh3XeidvtoTcwbQnAqmTlgftQ+4M/c+QCjXcemn0KzdxJb1/m6xcYcbgiV ezki/Nk6uqMz+tirc9qjCL3hMcxk1kSJNrbS4HFGYnyntYK91UDozRW96xilw7WFNcCI K16Trk2E7Xb7l6shqK9OFA1OK079bwV2ogprvUXo+DUuuuN9ecW+9lDMXKkDshNsXscy Z62aiB8tn0I4ZD+MgJ8b13UArYVzLFn2WB76ROY9ihiNvPRFp5wTZEOSOYXPuLVBUL0l GcPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724107898; x=1724712698; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i7OiajvUnedKpMidKrs6amtZmafu3g3RvoaYWNpbOxM=; b=PwMDpZJCz387qPlvT/+vUTSfLjO2LzF95WeLLD0ZzZUD3+FK9jzUUSF+F+fCZCe6sS DFvTWHByC8e20UitkTX2wTqtsMJU9+GdnHcSKg/WHBr3tvuWgoIbPejq84/umm8f9GT/ uS4ECUjXIb9UqCXmIdquSDczdN7nWIqzGi4eEEgj5Os7vhoGjxu9IM7/Rt1n43YT6jiI 25hceNoLJm/az6eiPMFsyHsVN+9Ygm9y6iIVdkudBoiP2hN6+5EMRTbhJzFb3623nfd6 5BC1VcDv80eZefroH2nbv81l0Et+BaTUkHKogH1+aCvnFFaNpghfb1dGEdFCM5Z+haS+ bJuQ== X-Gm-Message-State: AOJu0YyyzdJiP4ezT2Gc6BBTz/W8ZyxwRfuhkCfdTZYdPa1/KZbBJ3eu oXn4pepEs5ZZqN11hsMNXoGlGSnzF2dyqGkD5o2gxUwBe+GIUXSWVUmz2R9dguvAvlj2F6e6M/V BIrI= X-Google-Smtp-Source: AGHT+IGJ/6BQN7EHB0Vjds3FAJVLjOJS3T5dkTnXgVuQZGUQm5fmFCzRlNOkWS7znc5i4oHJnZT+Gg== X-Received: by 2002:a5d:5144:0:b0:36b:ea2d:fd5a with SMTP id ffacd0b85a97d-371c4ab1d82mr487659f8f.22.1724107897592; Mon, 19 Aug 2024 15:51:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 04/20] target/mips: Pass page table entry size as MemOp to get_pte() Date: Tue, 20 Aug 2024 00:51:00 +0200 Message-ID: <20240819225116.17928-5-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240819225116.17928-1-philmd@linaro.org> References: <20240819225116.17928-1-philmd@linaro.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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1724107978169116600 In order to simplify the next commit, pass the PTE size as MemOp. Rename: native_shift -> native_op directory_shift -> directory_mop leaf_shift -> leaf_mop Suggested-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240814090452.2591-2-philmd@linaro.org> --- target/mips/tcg/sysemu/tlb_helper.c | 58 ++++++++++++++--------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/target/mips/tcg/sysemu/tlb_helper.c b/target/mips/tcg/sysemu/t= lb_helper.c index 3ba6d369a6..60147ba0af 100644 --- a/target/mips/tcg/sysemu/tlb_helper.c +++ b/target/mips/tcg/sysemu/tlb_helper.c @@ -592,13 +592,13 @@ static void raise_mmu_exception(CPUMIPSState *env, ta= rget_ulong address, * resulting in a TLB or XTLB Refill exception. */ =20 -static bool get_pte(CPUMIPSState *env, uint64_t vaddr, int entry_size, +static bool get_pte(CPUMIPSState *env, uint64_t vaddr, MemOp op, uint64_t *pte) { - if ((vaddr & ((entry_size >> 3) - 1)) !=3D 0) { + if ((vaddr & (memop_size(op) - 1)) !=3D 0) { return false; } - if (entry_size =3D=3D 64) { + if (op =3D=3D MO_64) { *pte =3D cpu_ldq_code(env, vaddr); } else { *pte =3D cpu_ldl_code(env, vaddr); @@ -607,8 +607,9 @@ static bool get_pte(CPUMIPSState *env, uint64_t vaddr, = int entry_size, } =20 static uint64_t get_tlb_entry_layout(CPUMIPSState *env, uint64_t entry, - int entry_size, int ptei) + MemOp op, int ptei) { + unsigned entry_size =3D memop_size(op) << 3; uint64_t result =3D entry; uint64_t rixi; if (ptei > entry_size) { @@ -624,14 +625,12 @@ static uint64_t get_tlb_entry_layout(CPUMIPSState *en= v, uint64_t entry, static int walk_directory(CPUMIPSState *env, uint64_t *vaddr, int directory_index, bool *huge_page, bool *hgpg_directory_hit, uint64_t *pw_entrylo0, uint64_t *pw_entrylo1, - unsigned directory_shift, unsigned leaf_shift, int ptw_mmu_idx) + MemOp directory_mop, MemOp leaf_mop, int ptw_mmu_idx) { int dph =3D (env->CP0_PWCtl >> CP0PC_DPH) & 0x1; int psn =3D (env->CP0_PWCtl >> CP0PC_PSN) & 0x3F; int hugepg =3D (env->CP0_PWCtl >> CP0PC_HUGEPG) & 0x1; int pf_ptew =3D (env->CP0_PWField >> CP0PF_PTEW) & 0x3F; - uint32_t direntry_size =3D 1 << (directory_shift + 3); - uint32_t leafentry_size =3D 1 << (leaf_shift + 3); uint64_t entry; uint64_t paddr; int prot; @@ -643,14 +642,14 @@ static int walk_directory(CPUMIPSState *env, uint64_t= *vaddr, /* wrong base address */ return 0; } - if (!get_pte(env, *vaddr, direntry_size, &entry)) { + if (!get_pte(env, *vaddr, directory_mop, &entry)) { return 0; } =20 if ((entry & (1 << psn)) && hugepg) { *huge_page =3D true; *hgpg_directory_hit =3D true; - entry =3D get_tlb_entry_layout(env, entry, leafentry_size, pf_ptew= ); + entry =3D get_tlb_entry_layout(env, entry, leaf_mop, pf_ptew); w =3D directory_index - 1; if (directory_index & 0x1) { /* Generate adjacent page from same PTE for odd TLB page */ @@ -658,7 +657,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *= vaddr, *pw_entrylo0 =3D entry & ~lsb; /* even page */ *pw_entrylo1 =3D entry | lsb; /* odd page */ } else if (dph) { - int oddpagebit =3D 1 << leaf_shift; + int oddpagebit =3D 1 << leaf_mop; uint64_t vaddr2 =3D *vaddr ^ oddpagebit; if (*vaddr & oddpagebit) { *pw_entrylo1 =3D entry; @@ -669,10 +668,10 @@ static int walk_directory(CPUMIPSState *env, uint64_t= *vaddr, ptw_mmu_idx) !=3D TLBRET_MATCH) { return 0; } - if (!get_pte(env, vaddr2, leafentry_size, &entry)) { + if (!get_pte(env, vaddr2, leaf_mop, &entry)) { return 0; } - entry =3D get_tlb_entry_layout(env, entry, leafentry_size, pf_= ptew); + entry =3D get_tlb_entry_layout(env, entry, leaf_mop, pf_ptew); if (*vaddr & oddpagebit) { *pw_entrylo0 =3D entry; } else { @@ -711,7 +710,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, =20 /* Native pointer size */ /*For the 32-bit architectures, this bit is fixed to 0.*/ - int native_shift =3D (((env->CP0_PWSize >> CP0PS_PS) & 1) =3D=3D 0) ? = 2 : 3; + MemOp native_op =3D (((env->CP0_PWSize >> CP0PS_PS) & 1) =3D=3D 0) ? M= O_32 : MO_64; =20 /* Indices from PWField */ int pf_gdw =3D (env->CP0_PWField >> CP0PF_GDW) & 0x3F; @@ -728,11 +727,10 @@ static bool page_table_walk_refill(CPUMIPSState *env,= vaddr address, =20 /* Other HTW configs */ int hugepg =3D (env->CP0_PWCtl >> CP0PC_HUGEPG) & 0x1; - unsigned directory_shift, leaf_shift; + MemOp directory_mop, leaf_mop; =20 /* Offsets into tables */ unsigned goffset, uoffset, moffset, ptoffset0, ptoffset1; - uint32_t leafentry_size; =20 /* Starting address - Page Table Base */ uint64_t vaddr =3D env->CP0_PWBase; @@ -759,23 +757,21 @@ static bool page_table_walk_refill(CPUMIPSState *env,= vaddr address, } =20 /* HTW Shift values (depend on entry size) */ - directory_shift =3D (hugepg && (ptew =3D=3D 1)) ? native_shift + 1 : n= ative_shift; - leaf_shift =3D (ptew =3D=3D 1) ? native_shift + 1 : native_shift; + directory_mop =3D (hugepg && (ptew =3D=3D 1)) ? native_op + 1 : native= _op; + leaf_mop =3D (ptew =3D=3D 1) ? native_op + 1 : native_op; =20 - goffset =3D gindex << directory_shift; - uoffset =3D uindex << directory_shift; - moffset =3D mindex << directory_shift; - ptoffset0 =3D (ptindex >> 1) << (leaf_shift + 1); - ptoffset1 =3D ptoffset0 | (1 << (leaf_shift)); - - leafentry_size =3D 1 << (leaf_shift + 3); + goffset =3D gindex << directory_mop; + uoffset =3D uindex << directory_mop; + moffset =3D mindex << directory_mop; + ptoffset0 =3D (ptindex >> 1) << (leaf_mop + 1); + ptoffset1 =3D ptoffset0 | (1 << (leaf_mop)); =20 /* Global Directory */ if (gdw > 0) { vaddr |=3D goffset; switch (walk_directory(env, &vaddr, pf_gdw, &huge_page, &hgpg_gdhi= t, &pw_entrylo0, &pw_entrylo1, - directory_shift, leaf_shift, ptw_mmu_idx)) + directory_mop, leaf_mop, ptw_mmu_idx)) { case 0: return false; @@ -792,7 +788,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, vaddr |=3D uoffset; switch (walk_directory(env, &vaddr, pf_udw, &huge_page, &hgpg_udhi= t, &pw_entrylo0, &pw_entrylo1, - directory_shift, leaf_shift, ptw_mmu_idx)) + directory_mop, leaf_mop, ptw_mmu_idx)) { case 0: return false; @@ -809,7 +805,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, vaddr |=3D moffset; switch (walk_directory(env, &vaddr, pf_mdw, &huge_page, &hgpg_mdhi= t, &pw_entrylo0, &pw_entrylo1, - directory_shift, leaf_shift, ptw_mmu_idx)) + directory_mop, leaf_mop, ptw_mmu_idx)) { case 0: return false; @@ -827,10 +823,10 @@ static bool page_table_walk_refill(CPUMIPSState *env,= vaddr address, ptw_mmu_idx) !=3D TLBRET_MATCH) { return false; } - if (!get_pte(env, vaddr, leafentry_size, &dir_entry)) { + if (!get_pte(env, vaddr, leaf_mop, &dir_entry)) { return false; } - dir_entry =3D get_tlb_entry_layout(env, dir_entry, leafentry_size, pf_= ptew); + dir_entry =3D get_tlb_entry_layout(env, dir_entry, leaf_mop, pf_ptew); pw_entrylo0 =3D dir_entry; =20 /* Leaf Level Page Table - Second half of PTE pair */ @@ -839,10 +835,10 @@ static bool page_table_walk_refill(CPUMIPSState *env,= vaddr address, ptw_mmu_idx) !=3D TLBRET_MATCH) { return false; } - if (!get_pte(env, vaddr, leafentry_size, &dir_entry)) { + if (!get_pte(env, vaddr, leaf_mop, &dir_entry)) { return false; } - dir_entry =3D get_tlb_entry_layout(env, dir_entry, leafentry_size, pf_= ptew); + dir_entry =3D get_tlb_entry_layout(env, dir_entry, leaf_mop, pf_ptew); pw_entrylo1 =3D dir_entry; =20 refill: --=20 2.45.2