From nobody Fri May 17 22:44:33 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=1622039871; cv=none; d=zohomail.com; s=zohoarc; b=Otrnq/fopl2ZIddcGD+TZJfYtJhqkF+x4AFScLRSBCHMBF6YWjUBR7uWJ+MkTXpF8nYxIXwR1TDCCiYFFMrqnpUCXIFhTMTXqvuGHQ+UhO8bdZAybLIuMaN9WcTgITJ279yxjFwR5MJJjPmMDej/ghzwt3jOCvrzXEr7UHyRV7w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622039871; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=HUeSUqPOEskckk0TkouvB5ivk3ACoqMwJerum+EGVlQ=; b=m8yhRilSB7x4Z4rTjK58GocrrVhjr7aX91WXiC+NcIg2hy+QQL7pS57nyji1HoCVyErY2by66xX4Vmt49Q78VI4BmfTEexMWOTw1LWexyvK2cqFwLW//F4YXwKo9AZGcyAM50NxlJIOpfaHsgn6dmEfanAKZiCuXtUxZn47kDMk= 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 1622039871387305.1398302574165; Wed, 26 May 2021 07:37:51 -0700 (PDT) Received: from localhost ([::1]:38588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llufN-00017Z-Ex for importer@patchew.org; Wed, 26 May 2021 10:37:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lludJ-0008IQ-Gd; Wed, 26 May 2021 10:35:42 -0400 Received: from [201.28.113.2] (port=57152 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lludH-0004YG-F2; Wed, 26 May 2021 10:35:40 -0400 Received: from power9a ([10.10.71.235]) by outlook.eldorado.org.br with Microsoft SMTPSVC(8.5.9600.16384); Wed, 26 May 2021 11:35:33 -0300 Received: from eldorado.org.br (unknown [10.10.71.235]) by power9a (Postfix) with ESMTP id 9C5368013CA; Wed, 26 May 2021 11:35:33 -0300 (-03) From: "Bruno Larsen (billionai)" To: qemu-devel@nongnu.org Subject: [PATCH] target/ppc: fold ppc_store_ptcr into it's only caller Date: Wed, 26 May 2021 11:35:16 -0300 Message-Id: <20210526143516.125582-1-bruno.larsen@eldorado.org.br> X-Mailer: git-send-email 2.17.1 X-OriginalArrivalTime: 26 May 2021 14:35:33.0812 (UTC) FILETIME=[62B2CF40:01D7523C] X-Host-Lookup-Failed: Reverse DNS lookup failed for 201.28.113.2 (failed) 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=201.28.113.2; envelope-from=bruno.larsen@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, 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: farosas@linux.ibm.com, richard.henderson@linaro.org, luis.pires@eldorado.org.br, Greg Kurz , lucas.araujo@eldorado.org.br, fernando.valle@eldorado.org.br, qemu-ppc@nongnu.org, matheus.ferst@eldorado.org.br, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" ppc_store_ptcr, defined in mmu_helper.c, was only used by helper_store_ptcr, in misc_helper.c. To avoid possible confusion, the function was folded into the helper. Signed-off-by: Bruno Larsen (billionai) --- target/ppc/cpu.h | 1 - target/ppc/misc_helper.c | 24 +++++++++++++++++++++++- target/ppc/mmu_helper.c | 28 ---------------------------- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 203f07e48e..f39f5e0fff 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1290,7 +1290,6 @@ bool ppc_cpu_tlb_fill(CPUState *cs, vaddr address, in= t size, =20 #if !defined(CONFIG_USER_ONLY) void ppc_store_sdr1(CPUPPCState *env, target_ulong value); -void ppc_store_ptcr(CPUPPCState *env, target_ulong value); #endif /* !defined(CONFIG_USER_ONLY) */ void ppc_store_msr(CPUPPCState *env, target_ulong value); void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong val); diff --git a/target/ppc/misc_helper.c b/target/ppc/misc_helper.c index 442b12652c..c33f5f39b9 100644 --- a/target/ppc/misc_helper.c +++ b/target/ppc/misc_helper.c @@ -23,6 +23,7 @@ #include "exec/helper-proto.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" +#include "mmu-book3s-v3.h" =20 #include "helper_regs.h" =20 @@ -116,7 +117,28 @@ void helper_store_sdr1(CPUPPCState *env, target_ulong = val) void helper_store_ptcr(CPUPPCState *env, target_ulong val) { if (env->spr[SPR_PTCR] !=3D val) { - ppc_store_ptcr(env, val); + PowerPCCPU *cpu =3D env_archcpu(env); + target_ulong ptcr_mask =3D PTCR_PATB | PTCR_PATS; + target_ulong patbsize =3D val & PTCR_PATS; + + qemu_log_mask(CPU_LOG_MMU, "%s: " TARGET_FMT_lx "\n", __func__, va= l); + + assert(!cpu->vhyp); + assert(env->mmu_model & POWERPC_MMU_3_00); + + if (val & ~ptcr_mask) { + error_report("Invalid bits 0x"TARGET_FMT_lx" set in PTCR", + val & ~ptcr_mask); + val &=3D ptcr_mask; + } + + if (patbsize > 24) { + error_report("Invalid Partition Table size 0x" TARGET_FMT_lx + " stored in PTCR", patbsize); + return; + } + + env->spr[SPR_PTCR] =3D val; tlb_flush(env_cpu(env)); } } diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 5395e5ee5a..d45936be49 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -1987,34 +1987,6 @@ void ppc_tlb_invalidate_one(CPUPPCState *env, target= _ulong addr) =20 /*************************************************************************= ****/ /* Special registers manipulation */ -#if defined(TARGET_PPC64) -void ppc_store_ptcr(CPUPPCState *env, target_ulong value) -{ - PowerPCCPU *cpu =3D env_archcpu(env); - target_ulong ptcr_mask =3D PTCR_PATB | PTCR_PATS; - target_ulong patbsize =3D value & PTCR_PATS; - - qemu_log_mask(CPU_LOG_MMU, "%s: " TARGET_FMT_lx "\n", __func__, value); - - assert(!cpu->vhyp); - assert(env->mmu_model & POWERPC_MMU_3_00); - - if (value & ~ptcr_mask) { - error_report("Invalid bits 0x"TARGET_FMT_lx" set in PTCR", - value & ~ptcr_mask); - value &=3D ptcr_mask; - } - - if (patbsize > 24) { - error_report("Invalid Partition Table size 0x" TARGET_FMT_lx - " stored in PTCR", patbsize); - return; - } - - env->spr[SPR_PTCR] =3D value; -} - -#endif /* defined(TARGET_PPC64) */ =20 /* Segment registers load and store */ target_ulong helper_load_sr(CPUPPCState *env, target_ulong sr_num) --=20 2.17.1