From nobody Tue Feb 10 09:58:43 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616527321; cv=none; d=zohomail.com; s=zohoarc; b=GWHOoF/nQH2M9r81RFzMTCspjNZ6qHwtXMUi01z8EWpO9sMiOhVJprIEglsadM/gOB9UAwl4tiFAzt7du74+BFUK9bjlHyhQ9wniX2I+ngRPUE5SHEJFqzoroA3Y0hHek4HRigLCL9iGIpx9ATW8KOHJHKq6NS/i3Ay8DPezihg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616527321; 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=PwM2bOqU7aXMNaHDMLaVbRDxjZE33v838lGFsqK/S70=; b=Pth1Wliw+qRi57nNCUwOqKnzi/UBWAowidSW68m0j9ipg0cgTzWM7HiJ/QnfDDb6maPltIRKQxij7mhOGRUmBCXK/w6lrJXwNPSJClPR/XBGEO/f/PUi/vT2mSMELA7VPwaOqJJFVVi1hunL0AetY0qN7jgDScVeU0BJSpSkvnY= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616527320991657.6575638733709; Tue, 23 Mar 2021 12:22:00 -0700 (PDT) Received: from localhost ([::1]:57324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOmbH-000734-MT for importer@patchew.org; Tue, 23 Mar 2021 15:21:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOm0w-0008JQ-DR for qemu-devel@nongnu.org; Tue, 23 Mar 2021 14:44:26 -0400 Received: from mail-oi1-x229.google.com ([2607:f8b0:4864:20::229]:36729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOm0L-0003fo-IX for qemu-devel@nongnu.org; Tue, 23 Mar 2021 14:44:25 -0400 Received: by mail-oi1-x229.google.com with SMTP id c16so9204622oib.3 for ; Tue, 23 Mar 2021 11:43:46 -0700 (PDT) Received: from localhost.localdomain (171.189-204-159.bestelclientes.com.mx. [189.204.159.171]) by smtp.gmail.com with ESMTPSA id x23sm3902825ood.28.2021.03.23.11.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 11:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PwM2bOqU7aXMNaHDMLaVbRDxjZE33v838lGFsqK/S70=; b=w/YHdJbgIo0mkUpAQmiTwnmyn2QIKSWkMPwpCIgwFo22G59dL0ZmcDyc9XkNTwLsZy iSLEojUc7LZEGM4gSeEgXLeWMLQZofjA8ZFoEGsjiE0rwKrmLhttoFH2RGeTMRviPtt6 +A3gfRKz/qusEPEWkYqNqYF6lltTj327ZtkygH81MVI0413szAn5sz8bW5rkOSXOX5I0 pXe5UtHJc1Wa00ltLo8uJVP5LGaZjLpR3GayD2p9YG41TxNlaC4UVUlLHBu4NmgI/XzH a0Y9fDK2pCJWB1BWTUiFmm8IFp4GHUMX8dmcyr4PeyH1pg0QXbJOT1KEnoIgq4PHOBIH LRNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PwM2bOqU7aXMNaHDMLaVbRDxjZE33v838lGFsqK/S70=; b=PGipFA+aTVFwRIVgiFQ4AvFZMdEFordV8/NB9QwBu+DfGjqBfv+JQtbeeO5bK9AmWF iREGAwv1sl28QX6H7uRmV7nBed34KO2JGrGaFEzdVQ9vQH4Y2NBJWbohFtLdWu9KeWMB KuikmK+vRgfGt4WdF4Ix1SiuElqV7otTVTps9lCTUJxQTeVZyU1XT8GWjA9y/bxCxTez qizzeiaNex0eEcqdmSuPW6k8Waequ6XLHv7+q7jUKCdM9dIP9bvmyZM5hzN0bsC/mg4Q LBIN0XEizOBBR5eMeEDmonrcNM1UWBtywaOmRi2Ovt/q0k2Wlyj+IFpmLpcSSErPgcS1 /T1A== X-Gm-Message-State: AOAM532NfGjBL98hyK30c62631JpF5ymGd9eauIncqnykxBbre28sRky l7Rw1cHXYKjEkYbF8OGyllfLaGmoGMpmr5OM X-Google-Smtp-Source: ABdhPJyabFpr0But2qPI1qRYtyNDKM8y2mExyaZLHQD0IW9NCss6Ybjn7FVycYYBZ/IeHAdH9w8mpA== X-Received: by 2002:aca:498a:: with SMTP id w132mr4284206oia.66.1616525025614; Tue, 23 Mar 2021 11:43:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 02/10] target/ppc: Disconnect hflags from MSR Date: Tue, 23 Mar 2021 12:43:32 -0600 Message-Id: <20210323184340.619757-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210323184340.619757-1-richard.henderson@linaro.org> References: <20210323184340.619757-1-richard.henderson@linaro.org> 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=2607:f8b0:4864:20::229; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x229.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 autolearn=unavailable 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: Ivan Warren , qemu-ppc@nongnu.org, david@gibson.dropbear.id.au 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" Copying flags directly from msr has drawbacks: (1) msr bits mean different things per cpu, (2) msr has 64 bits on 64 cpus while tb->flags has only 32 bits. Create a enum to define these bits. Document the origin of each bit and validate those bits that must match MSR. This fixes the truncation of env->hflags to tb->flags, because we no longer have hflags bits set above bit 31. Most of the code in ppc_tr_init_disas_context is moved over to hreg_compute_hflags. Some of it is simple extractions from msr, some requires examining other cpu flags. Anything that is moved becomes a simple extract from hflags in ppc_tr_init_disas_context. Several existing bugs are left in ppc_tr_init_disas_context, where additional changes are required -- to be addressed in future patches. Remove a broken #if 0 block. Reported-by: Ivan Warren Signed-off-by: Richard Henderson --- target/ppc/cpu.h | 25 ++++++++++++++++ target/ppc/helper_regs.c | 65 +++++++++++++++++++++++++++++++++------- target/ppc/translate.c | 55 ++++++++++------------------------ 3 files changed, 95 insertions(+), 50 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index fd13489dce..fe6c3f815d 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -585,6 +585,31 @@ enum { POWERPC_FLAG_HID0_LE =3D 0x00400000, }; =20 +/* + * Bits for env->hflags. + * + * Most of these bits overlap with corresponding bits in MSR, + * but some come from other sources. Those that do come from + * the MSR are validated in hreg_compute_hflags. + */ +enum { + HFLAGS_LE =3D 0, /* MSR_LE -- comes from elsewhere on 601 */ + HFLAGS_HV =3D 1, /* computed from MSR_HV and other state */ + HFLAGS_64 =3D 2, /* computed from MSR_CE and MSR_SF */ + HFLAGS_DR =3D 4, /* MSR_DR */ + HFLAGS_IR =3D 5, /* MSR_IR */ + HFLAGS_SPE =3D 6, /* from MSR_SPE if cpu has SPE; avoid overlap w/ MS= R_VR */ + HFLAGS_VSX =3D 7, /* from MSR_VSX if cpu has VSX; avoid overlap w/ MS= R_AP */ + HFLAGS_TM =3D 8, /* computed from MSR_TM */ + HFLAGS_BE =3D 9, /* MSR_BE -- from elsewhere on embedded ppc */ + HFLAGS_SE =3D 10, /* MSR_SE -- from elsewhere on embedded ppc */ + HFLAGS_FP =3D 13, /* MSR_FP */ + HFLAGS_PR =3D 14, /* MSR_PR */ + HFLAGS_SA =3D 22, /* MSR_SA */ + HFLAGS_AP =3D 23, /* MSR_AP */ + HFLAGS_VR =3D 25, /* MSR_VR if cpu has VRE */ +}; + /*************************************************************************= ****/ /* Floating point status and control register = */ #define FPSCR_DRN2 34 /* Decimal Floating-Point rounding control = */ diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c index a87e354ca2..df9673b90f 100644 --- a/target/ppc/helper_regs.c +++ b/target/ppc/helper_regs.c @@ -18,6 +18,7 @@ */ =20 #include "qemu/osdep.h" +#include "cpu.h" #include "qemu/main-loop.h" #include "exec/exec-all.h" #include "sysemu/kvm.h" @@ -87,24 +88,66 @@ void hreg_compute_mem_idx(CPUPPCState *env) =20 void hreg_compute_hflags(CPUPPCState *env) { - target_ulong hflags_mask; + target_ulong msr =3D env->msr; + uint32_t ppc_flags =3D env->flags; + uint32_t hflags =3D 0; + uint32_t msr_mask; =20 - /* We 'forget' FE0 & FE1: we'll never generate imprecise exceptions */ - hflags_mask =3D (1 << MSR_VR) | (1 << MSR_AP) | (1 << MSR_SA) | - (1 << MSR_PR) | (1 << MSR_FP) | (1 << MSR_SE) | (1 << MSR_BE) | - (1 << MSR_LE) | (1 << MSR_VSX) | (1 << MSR_IR) | (1 << MSR_DR); - hflags_mask |=3D (1ULL << MSR_CM) | (1ULL << MSR_SF) | MSR_HVB; - hreg_compute_mem_idx(env); - env->hflags =3D env->msr & hflags_mask; + /* Some bits come straight across from MSR. */ + QEMU_BUILD_BUG_ON(MSR_LE !=3D HFLAGS_LE); + QEMU_BUILD_BUG_ON(MSR_PR !=3D HFLAGS_PR); + QEMU_BUILD_BUG_ON(MSR_DR !=3D HFLAGS_DR); + QEMU_BUILD_BUG_ON(MSR_IR !=3D HFLAGS_IR); + QEMU_BUILD_BUG_ON(MSR_FP !=3D HFLAGS_FP); + QEMU_BUILD_BUG_ON(MSR_SA !=3D HFLAGS_SA); + QEMU_BUILD_BUG_ON(MSR_AP !=3D HFLAGS_AP); + msr_mask =3D ((1 << MSR_LE) | (1 << MSR_PR) | + (1 << MSR_DR) | (1 << MSR_IR) | + (1 << MSR_FP) | (1 << MSR_SA) | (1 << MSR_AP)); =20 - if (env->flags & POWERPC_FLAG_HID0_LE) { + if (ppc_flags & POWERPC_FLAG_HID0_LE) { /* * Note that MSR_LE is not set in env->msr_mask for this cpu, - * and so will never be set in msr or hflags at this point. + * and so will never be set in msr. */ uint32_t le =3D extract32(env->spr[SPR_HID0], 3, 1); - env->hflags |=3D le << MSR_LE; + hflags |=3D le << MSR_LE; } + + if (ppc_flags & POWERPC_FLAG_BE) { + QEMU_BUILD_BUG_ON(MSR_BE !=3D HFLAGS_BE); + msr_mask |=3D 1 << MSR_BE; + } + if (ppc_flags & POWERPC_FLAG_SE) { + QEMU_BUILD_BUG_ON(MSR_SE !=3D HFLAGS_SE); + msr_mask |=3D 1 << MSR_SE; + } + + if (msr_is_64bit(env, msr)) { + hflags |=3D 1 << HFLAGS_64; + } + if ((ppc_flags & POWERPC_FLAG_SPE) && (msr & (1 << MSR_SPE))) { + hflags |=3D 1 << HFLAGS_SPE; + } + if (ppc_flags & POWERPC_FLAG_VRE) { + QEMU_BUILD_BUG_ON(MSR_VR !=3D HFLAGS_VR); + msr_mask |=3D 1 << MSR_VR; + } + if ((ppc_flags & POWERPC_FLAG_VSX) && (msr & (1 << MSR_VSX))) { + hflags |=3D 1 << HFLAGS_VSX; + } + if ((ppc_flags & POWERPC_FLAG_TM) && (msr & (1ull << MSR_TM))) { + hflags |=3D 1 << HFLAGS_TM; + } + +#ifndef CONFIG_USER_ONLY + if (!env->has_hv_mode || (msr & (1ull << MSR_HV))) { + hflags |=3D 1 << HFLAGS_HV; + } +#endif + + env->hflags =3D hflags | (msr & msr_mask); + hreg_compute_mem_idx(env); } =20 void cpu_interrupt_exittb(CPUState *cs) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 0984ce637b..a9325a12e5 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -7879,67 +7879,48 @@ static void ppc_tr_init_disas_context(DisasContextB= ase *dcbase, CPUState *cs) { DisasContext *ctx =3D container_of(dcbase, DisasContext, base); CPUPPCState *env =3D cs->env_ptr; + uint32_t hflags =3D ctx->base.tb->flags; int bound; =20 ctx->exception =3D POWERPC_EXCP_NONE; ctx->spr_cb =3D env->spr_cb; - ctx->pr =3D msr_pr; + ctx->pr =3D (hflags >> HFLAGS_PR) & 1; ctx->mem_idx =3D env->dmmu_idx; - ctx->dr =3D msr_dr; -#if !defined(CONFIG_USER_ONLY) - ctx->hv =3D msr_hv || !env->has_hv_mode; -#endif + ctx->dr =3D (hflags >> HFLAGS_DR) & 1; + ctx->hv =3D (hflags >> HFLAGS_HV) & 1; ctx->insns_flags =3D env->insns_flags; ctx->insns_flags2 =3D env->insns_flags2; ctx->access_type =3D -1; ctx->need_access_type =3D !mmu_is_64bit(env->mmu_model); - ctx->le_mode =3D !!(env->hflags & (1 << MSR_LE)); + ctx->le_mode =3D (hflags >> HFLAGS_LE) & 1; ctx->default_tcg_memop_mask =3D ctx->le_mode ? MO_LE : MO_BE; ctx->flags =3D env->flags; #if defined(TARGET_PPC64) - ctx->sf_mode =3D msr_is_64bit(env, env->msr); + ctx->sf_mode =3D (hflags >> HFLAGS_64) & 1; ctx->has_cfar =3D !!(env->flags & POWERPC_FLAG_CFAR); #endif ctx->lazy_tlb_flush =3D env->mmu_model =3D=3D POWERPC_MMU_32B || env->mmu_model =3D=3D POWERPC_MMU_601 || env->mmu_model & POWERPC_MMU_64; =20 - ctx->fpu_enabled =3D !!msr_fp; - if ((env->flags & POWERPC_FLAG_SPE) && msr_spe) { - ctx->spe_enabled =3D !!msr_spe; - } else { - ctx->spe_enabled =3D false; - } - if ((env->flags & POWERPC_FLAG_VRE) && msr_vr) { - ctx->altivec_enabled =3D !!msr_vr; - } else { - ctx->altivec_enabled =3D false; - } - if ((env->flags & POWERPC_FLAG_VSX) && msr_vsx) { - ctx->vsx_enabled =3D !!msr_vsx; - } else { - ctx->vsx_enabled =3D false; - } + ctx->fpu_enabled =3D (hflags >> HFLAGS_FP) & 1; + ctx->spe_enabled =3D (hflags >> HFLAGS_SPE) & 1; + ctx->altivec_enabled =3D (hflags >> HFLAGS_VR) & 1; + ctx->vsx_enabled =3D (hflags >> HFLAGS_VSX) & 1; if ((env->flags & POWERPC_FLAG_SCV) && (env->spr[SPR_FSCR] & (1ull << FSCR_SCV))) { ctx->scv_enabled =3D true; } else { ctx->scv_enabled =3D false; } -#if defined(TARGET_PPC64) - if ((env->flags & POWERPC_FLAG_TM) && msr_tm) { - ctx->tm_enabled =3D !!msr_tm; - } else { - ctx->tm_enabled =3D false; - } -#endif + ctx->tm_enabled =3D (hflags >> HFLAGS_TM) & 1; ctx->gtse =3D !!(env->spr[SPR_LPCR] & LPCR_GTSE); - if ((env->flags & POWERPC_FLAG_SE) && msr_se) { - ctx->singlestep_enabled =3D CPU_SINGLE_STEP; - } else { - ctx->singlestep_enabled =3D 0; + + ctx->singlestep_enabled =3D 0; + if ((hflags >> HFLAGS_SE) & 1) { + ctx->singlestep_enabled |=3D CPU_SINGLE_STEP; } - if ((env->flags & POWERPC_FLAG_BE) && msr_be) { + if ((hflags >> HFLAGS_BE) & 1) { ctx->singlestep_enabled |=3D CPU_BRANCH_STEP; } if ((env->flags & POWERPC_FLAG_DE) && msr_de) { @@ -7956,10 +7937,6 @@ static void ppc_tr_init_disas_context(DisasContextBa= se *dcbase, CPUState *cs) if (unlikely(ctx->base.singlestep_enabled)) { ctx->singlestep_enabled |=3D GDBSTUB_SINGLE_STEP; } -#if defined(DO_SINGLE_STEP) && 0 - /* Single step trace mode */ - msr_se =3D 1; -#endif =20 bound =3D -(ctx->base.pc_first | TARGET_PAGE_MASK) / 4; ctx->base.max_insns =3D MIN(ctx->base.max_insns, bound); --=20 2.25.1