From nobody Tue Feb 10 01:33:24 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621429588; cv=none; d=zohomail.com; s=zohoarc; b=DyqnWlds2NcXj+ivcDi8J8zO/sl42pTLJ1ozKSZcM9YWowH/YhQhsJVRBVpdqdMGLA4rREa3yzd6h5brwTpNv7zualajtlAh5T5OC9eBvDhcmZ1NEYjvz3mY25pqlrtphjvqJ/SEWiZkbBjl9vtlZCzuRiz0cb9VjW3ADVfWjbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621429588; h=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=1I5jcWF/aZqelxeRVoTi1W1qn8ETYemZo15Z64Y60a0=; b=SDYv+/4EWH30ypiS3cTO/WinLNDQg3TuQ4l7RA9XWu2eg6nWSIsWKNUN5MPuBd2DWTYyda8BfE+ucTm3bhvucHMYdOOH8490Qv5ley712ISLN4PHHvXBIHtx2udggGKZcoXFYjg+f5BV4yrymWjNSn+8fjadePzrj6LiSB7q5fg= 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+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 1621429588633870.63672469956; Wed, 19 May 2021 06:06:28 -0700 (PDT) Received: from localhost ([::1]:36450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljLu7-0001wW-Sm for importer@patchew.org; Wed, 19 May 2021 09:06:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLgn-0000pQ-Nj; Wed, 19 May 2021 08:52:41 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:39163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLgh-0001Df-RW; Wed, 19 May 2021 08:52:40 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FlXnb4pr4z9ssP; Wed, 19 May 2021 22:52:03 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1621428723; bh=LInd8rsPdruPGaJISGZyoKNIhPakN+eNtSkr6SgZ2zU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m1Gcf+n+rOzHbl6FG1Zn3Y5VUHT2C8xLzsmdru+Ds3jT41DM7uhUMKO51V0qjSbxU DGN0cfbcek9ZCq/p7DXPn7P4Wprw0PZ7n0sxTkwNXxQsLe5NHRXwyeKJZgzcv7Wziw nJ9gkp1DOQX6IcFRgTtUct3Y7fMzikInRKL2rSgE= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 14/48] target/ppc: moved ppc_store_sdr1 to cpu.c Date: Wed, 19 May 2021 22:51:14 +1000 Message-Id: <20210519125148.27720-15-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210519125148.27720-1-david@gibson.dropbear.id.au> References: <20210519125148.27720-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-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: richard.henderson@linaro.org, David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, "Bruno Larsen \(billionai\)" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: "Bruno Larsen (billionai)" Moved this function that is required in !TCG cases into a common code file Signed-off-by: Bruno Larsen (billionai) Message-Id: <20210512140813.112884-3-bruno.larsen@eldorado.org.br> Reviewed-by: Richard Henderson [dwg: Fixed compile error with linux-user targets] Signed-off-by: David Gibson --- target/ppc/cpu.c | 31 +++++++++++++++++++++++++++++++ target/ppc/mmu_helper.c | 26 -------------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/target/ppc/cpu.c b/target/ppc/cpu.c index cb794e9f4f..d957d1a687 100644 --- a/target/ppc/cpu.c +++ b/target/ppc/cpu.c @@ -20,7 +20,10 @@ #include "qemu/osdep.h" #include "cpu.h" #include "cpu-models.h" +#include "cpu-qom.h" +#include "exec/log.h" #include "fpu/softfloat-helpers.h" +#include "mmu-hash64.h" =20 target_ulong cpu_read_xer(CPUPPCState *env) { @@ -61,3 +64,31 @@ uint32_t ppc_get_vscr(CPUPPCState *env) uint32_t sat =3D (env->vscr_sat.u64[0] | env->vscr_sat.u64[1]) !=3D 0; return env->vscr | (sat << VSCR_SAT); } + +#ifdef CONFIG_SOFTMMU +void ppc_store_sdr1(CPUPPCState *env, target_ulong value) +{ + PowerPCCPU *cpu =3D env_archcpu(env); + qemu_log_mask(CPU_LOG_MMU, "%s: " TARGET_FMT_lx "\n", __func__, value); + assert(!cpu->vhyp); +#if defined(TARGET_PPC64) + if (mmu_is_64bit(env->mmu_model)) { + target_ulong sdr_mask =3D SDR_64_HTABORG | SDR_64_HTABSIZE; + target_ulong htabsize =3D value & SDR_64_HTABSIZE; + + if (value & ~sdr_mask) { + error_report("Invalid bits 0x"TARGET_FMT_lx" set in SDR1", + value & ~sdr_mask); + value &=3D sdr_mask; + } + if (htabsize > 28) { + error_report("Invalid HTABSIZE 0x" TARGET_FMT_lx" stored in SD= R1", + htabsize); + return; + } + } +#endif /* defined(TARGET_PPC64) */ + /* FIXME: Should check for valid HTABMASK values in 32-bit case */ + env->spr[SPR_SDR1] =3D value; +} +#endif /* CONFIG_SOFTMMU */ diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index ca88658cba..06e1ebdcbc 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -2085,32 +2085,6 @@ void ppc_tlb_invalidate_one(CPUPPCState *env, target= _ulong addr) =20 /*************************************************************************= ****/ /* Special registers manipulation */ -void ppc_store_sdr1(CPUPPCState *env, target_ulong value) -{ - PowerPCCPU *cpu =3D env_archcpu(env); - qemu_log_mask(CPU_LOG_MMU, "%s: " TARGET_FMT_lx "\n", __func__, value); - assert(!cpu->vhyp); -#if defined(TARGET_PPC64) - if (mmu_is_64bit(env->mmu_model)) { - target_ulong sdr_mask =3D SDR_64_HTABORG | SDR_64_HTABSIZE; - target_ulong htabsize =3D value & SDR_64_HTABSIZE; - - if (value & ~sdr_mask) { - error_report("Invalid bits 0x"TARGET_FMT_lx" set in SDR1", - value & ~sdr_mask); - value &=3D sdr_mask; - } - if (htabsize > 28) { - error_report("Invalid HTABSIZE 0x" TARGET_FMT_lx" stored in SD= R1", - htabsize); - return; - } - } -#endif /* defined(TARGET_PPC64) */ - /* FIXME: Should check for valid HTABMASK values in 32-bit case */ - env->spr[SPR_SDR1] =3D value; -} - #if defined(TARGET_PPC64) void ppc_store_ptcr(CPUPPCState *env, target_ulong value) { --=20 2.31.1