From nobody Mon Nov 25 09:51:15 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; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1716765519800537.2079470235376; Sun, 26 May 2024 16:18:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBN61-0000f3-0D; Sun, 26 May 2024 19:16:09 -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 1sBN5c-0006vH-Ui; Sun, 26 May 2024 19:15:50 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBN5Z-00044q-OP; Sun, 26 May 2024 19:15:44 -0400 Received: from zero.eik.bme.hu (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id DB7C54E650C; Mon, 27 May 2024 01:13:14 +0200 (CEST) Received: from zero.eik.bme.hu ([127.0.0.1]) by zero.eik.bme.hu (zero.eik.bme.hu [127.0.0.1]) (amavisd-new, port 10028) with ESMTP id j-v2DiMr42Eg; Mon, 27 May 2024 01:13:12 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id F1FEA4E654D; Mon, 27 May 2024 01:13:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at eik.bme.hu Message-Id: <3b3cce4a39e0debbf6fa29d4a2ead3014898cb93.1716763435.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 36/43] target/ppc/mmu-hash32: Remove some static inlines from header MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Nicholas Piggin , Daniel Henrique Barboza Date: Mon, 27 May 2024 01:13:12 +0200 (CEST) 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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu 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, 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-ZM-MESSAGEID: 1716765521533100001 Content-Type: text/plain; charset="utf-8" Two of these are not used anywhere and the other two are used only once and can be inlined and removed from the header. Signed-off-by: BALATON Zoltan --- target/ppc/mmu-hash32.c | 5 +++-- target/ppc/mmu-hash32.h | 32 -------------------------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c index a2c0ac05d2..7a6a674f8a 100644 --- a/target/ppc/mmu-hash32.c +++ b/target/ppc/mmu-hash32.c @@ -206,17 +206,18 @@ static hwaddr ppc_hash32_pteg_search(PowerPCCPU *cpu,= hwaddr pteg_off, { hwaddr pte_offset =3D pteg_off; target_ulong pte0, pte1; + hwaddr base =3D ppc_hash32_hpt_base(cpu); int i; =20 for (i =3D 0; i < HPTES_PER_GROUP; i++) { - pte0 =3D ppc_hash32_load_hpte0(cpu, pte_offset); + pte0 =3D ldl_phys(CPU(cpu)->as, base + pte_offset); /* * pte0 contains the valid bit and must be read before pte1, * otherwise we might see an old pte1 with a new valid bit and * thus an inconsistent hpte value */ smp_rmb(); - pte1 =3D ppc_hash32_load_hpte1(cpu, pte_offset); + pte1 =3D ldl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_= 32 / 2); =20 if ((pte0 & HPTE32_V_VALID) && (secondary =3D=3D !!(pte0 & HPTE32_V_SECONDARY)) diff --git a/target/ppc/mmu-hash32.h b/target/ppc/mmu-hash32.h index 2838de031c..4db55fb0a0 100644 --- a/target/ppc/mmu-hash32.h +++ b/target/ppc/mmu-hash32.h @@ -69,38 +69,6 @@ static inline hwaddr ppc_hash32_hpt_mask(PowerPCCPU *cpu) return ((cpu->env.spr[SPR_SDR1] & SDR_32_HTABMASK) << 16) | 0xFFFF; } =20 -static inline target_ulong ppc_hash32_load_hpte0(PowerPCCPU *cpu, - hwaddr pte_offset) -{ - target_ulong base =3D ppc_hash32_hpt_base(cpu); - - return ldl_phys(CPU(cpu)->as, base + pte_offset); -} - -static inline target_ulong ppc_hash32_load_hpte1(PowerPCCPU *cpu, - hwaddr pte_offset) -{ - target_ulong base =3D ppc_hash32_hpt_base(cpu); - - return ldl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2= ); -} - -static inline void ppc_hash32_store_hpte0(PowerPCCPU *cpu, - hwaddr pte_offset, target_ulong = pte0) -{ - target_ulong base =3D ppc_hash32_hpt_base(cpu); - - stl_phys(CPU(cpu)->as, base + pte_offset, pte0); -} - -static inline void ppc_hash32_store_hpte1(PowerPCCPU *cpu, - hwaddr pte_offset, target_ulong = pte1) -{ - target_ulong base =3D ppc_hash32_hpt_base(cpu); - - stl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2, pte1); -} - static inline hwaddr get_pteg_offset32(PowerPCCPU *cpu, hwaddr hash) { return (hash * HASH_PTEG_SIZE_32) & ppc_hash32_hpt_mask(cpu); --=20 2.30.9