From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5A486C5DF81 for ; Mon, 24 Aug 2026 14:10:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyVNb-0004Ep-GZ; Mon, 24 Aug 2026 10:10:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyVNZ-0004DN-Gc; Mon, 24 Aug 2026 10:10:25 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyVNW-00050E-MI; Mon, 24 Aug 2026 10:10:25 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67OD1dGe826425; Mon, 24 Aug 2026 14:10:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:reply-to:subject:to; s=pp1; bh=T5lz++RZF4f2Nm+u0uLucP/V1XBCSzmiOYhfJvd07AQ=; b=CCYEM3+WAkEx PoSoECAgQuGflra7XBTCErcA31M+c9wGINA/d80w5KSlwi/9iU41we9tSvLJDxOE mLehr4w4/8d84f1kWyEQPmBTZii1ERfUA2/T3X1419yOWDRjFNV9i0UgYejU2j5A dcd4roVpHO7rzdGD4hAM2vLWKHQ/v43WNArrjuHHo4X/zg/I8LpEsGl8PexOgGBv cabbFukjfXRIIT3GeSVV+zP6oRuL3l9uBaKpxHdu4iLA7Sx2otPr2UEkobeN2qnA VkA9FjxNrdzvCXjNiS4GsB0U+1+ijeoyFge12TlVwkUIQsLv3VKx1VUut7/725o5 +8ArK/i7Ow== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4g726e9ukj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 14:10:20 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67ODuIKU029393; Mon, 24 Aug 2026 14:10:19 GMT Received: from smtprelay07.dal12v.mail.ibm.com ([172.16.1.9]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4g7rsxx44u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 14:10:19 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay07.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67OEAIh729229604 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 24 Aug 2026 14:10:18 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E135A5804E; Mon, 24 Aug 2026 14:10:17 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 73DE65803F; Mon, 24 Aug 2026 14:10:16 +0000 (GMT) Received: from mambor8.rchland.ibm.com (unknown [9.10.239.198]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 24 Aug 2026 14:10:16 +0000 (GMT) Message-ID: <2b366d577cb5c51f4ac0ee557c405078a11e5438.camel@linux.ibm.com> Subject: Re: [PATCH 03/29] target/ppc: Convert cache instructions to decodetree From: Miles Glenn To: Chinmay Rath , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, harshpb@linux.ibm.com Cc: npiggin@gmail.com, richard.henderson@linaro.org, vishalc@linux.ibm.com, tshah@linux.ibm.com, shivangu@linux.ibm.com, ojaswin@linux.ibm.com, aboorvad@linux.ibm.com, amachhiw@linux.ibm.com, sv@linux.ibm.com, shivani@linux.ibm.com, mkchauras@gmail.com, uverma@linux.ibm.com, nikhilks@linux.ibm.com, Tasmiya Nalatwad Date: Mon, 24 Aug 2026 09:10:16 -0500 In-Reply-To: <20260820140114.327023-4-rathc@linux.ibm.com> References: <20260820140114.327023-1-rathc@linux.ibm.com> <20260820140114.327023-4-rathc@linux.ibm.com> Organization: IBM Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 (3.28.5-27.el8_10) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=TfimcxQh c=1 sm=1 tr=0 ts=6a8c50cc cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=lrekW4Znv5DqSyw8BoEA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI0MDExOCBTYWx0ZWRfX0n1hZZ7J0FRl m2SzdCLDc8j1XF1lWY6Y3WillVDkAtcORg1t3V/U3Wn7xLMXtVYdm11tHgUYtB7q0i3L1D92hYD xezh7xnPzAoIINkCx/fkAFbsdbkgVi8= X-Proofpoint-GUID: 9-txm_umTybHRRS52oWl-jjuNf4Aa4Lc X-Proofpoint-ORIG-GUID: ddCPraqOXh7eJ4pE_TdGl1ixGba5e1WA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI0MDExOCBTYWx0ZWRfX9bYHYnYmUyzp yaK+OSIvmFZPqMcR9A6zCC+CELYMKesQTxRWRP1l4T6CKFg6SLuvihZSl4/KNlx+a+crKpLPppr eu1L6qiQ07dWIXv7tjdbtrKU/0FUoh6ElvSRo/BmCkusMxiElQWi7thKOJcFXhooDyZbl8805qh GvpGBMbP+Jf1tl4hIXLU3itfsTI400KIv3h4SVVL11TCEwQX9nlcZ2+LRR50MqTqBtY1QEQs12h RRVcHDYQRveArWgx+4G6xj29lPb6AwQwB8AxmKm1t29VPQ1Bof38LsSkzRlTKzCcHYCIHs12CoT 0pn759+8XtNaRsYkMpR4nFiwHOyuSwyjxFq7ftlQXAJi5jgYYJRwW/fRxL4wj9Hiy2cq1gVBkL0 /yoDlBjSDVlcpjXbu+u7bC/bGl86uTUkLK3wj29C8NXBvTs03xew+/vgvuscILV45MaL7kgvayG UHhQV0J86LCs1De+oKQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_04,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 phishscore=0 impostorscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608240118 Received-SPF: pass client-ip=148.163.158.5; envelope-from=milesg@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: milesg@linux.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Glenn Miles Thanks, Glenn On Thu, 2026-08-20 at 19:30 +0530, Chinmay Rath wrote: > From: Nikhil Kumar Singh > > Convert cache management instructions to decodetree using custom > X-form layouts (@X_ea, @X_l, @X_th) and dedicated translation functions. > This ensures reserved bits are accurately represented and ignored by > the decoder (using '-' in the patterns), rather than being erroneously > parsed into instruction fields. > > Legacy GEN_HANDLER-based implementations are removed. > > The implementation preserves legacy semantics, including: > - MMU-visible accesses for instructions treated as loads > (e.g. dcbt, dcbtst, dcbtep, dcbtstep) > - Supervisor and BookE-specific constraints > - Effective address computation via do_ea_calc() > > Instructions that were defined as no-ops in the legacy implementation > remain no-ops here. > > Note on intentional behavior changes: > - dcbf now validates the L field against the Power ISA v3.1 set of > legal values (0, 1, 3, 4, 6). > - Reserved bits that were previously encoded as part of the opcode > mask (and trapped if set) are now properly decoded as "don't care" > ('-' in the pattern). > > Testing: > - Verified TCG equivalence for all cache operations > > Signed-off-by: Nikhil Kumar Singh > Tested-by: Tasmiya Nalatwad > Signed-off-by: Chinmay Rath > --- > target/ppc/helper.h | 8 +- > target/ppc/insn32.decode | 35 +++ > target/ppc/mem_helper.c | 8 +- > target/ppc/translate.c | 478 ++++++++++++++++++++------------------- > 4 files changed, 292 insertions(+), 237 deletions(-) > > diff --git a/target/ppc/helper.h b/target/ppc/helper.h > index 6b2d19a3ad..46ad78d1d4 100644 > --- a/target/ppc/helper.h > +++ b/target/ppc/helper.h > @@ -48,12 +48,12 @@ DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) > DEF_HELPER_4(lsw, void, env, tl, i32, i32) > DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) > DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) > -DEF_HELPER_FLAGS_3(dcbz, TCG_CALL_NO_WG, void, env, tl, int) > +DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int) > #ifdef TARGET_PPC64 > -DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl) > +DEF_HELPER_FLAGS_2(DCBZL, TCG_CALL_NO_WG, void, env, tl) > #endif > -DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) > -DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) > +DEF_HELPER_FLAGS_2(ICBI, TCG_CALL_NO_WG, void, env, tl) > +DEF_HELPER_FLAGS_2(ICBIEP, TCG_CALL_NO_WG, void, env, tl) > > #if defined(TARGET_PPC64) > DEF_HELPER_4(DIVDEU, i64, env, i64, i64, i32) > diff --git a/target/ppc/insn32.decode b/target/ppc/insn32.decode > index 26948e08a7..6b1cf9a0a9 100644 > --- a/target/ppc/insn32.decode > +++ b/target/ppc/insn32.decode > @@ -1306,6 +1306,41 @@ XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair > XVF64GERNP 111011 ... -- .... 0 ..... 01111010 ..- @XX3_at xa=%xx_xa_pair > XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair > > +## Cache Management Instructions > + > +&X_ea ra rb > +@X_ea ...... ..... ra:5 rb:5 .......... . &X_ea > + > +&X_l l ra rb > +@X_l ...... .. l:3 ra:5 rb:5 .......... . &X_l > + > +&X_th th ra rb > +@X_th ...... th:5 ra:5 rb:5 .......... . &X_th > + > +DCBF 011111 -- ... ..... ..... 0001010110 - @X_l > +DCBFEP 011111 ----- ..... ..... 0001111111 - @X_ea > +DCBI 011111 ----- ..... ..... 0111010110 - @X_ea > +DCBST 011111 ----- ..... ..... 0000110110 - @X_ea > +DCBSTEP 011111 ----- ..... ..... 0000111111 - @X_ea > +DCBA 011111 ----- ..... ..... 1011110110 - @X_ea > + > +DCBT 011111 ..... ..... ..... 0100010110 - @X_th > +DCBTEP 011111 ----- ..... ..... 0100111111 - @X_ea > +DCBTST 011111 ..... ..... ..... 0011110110 - @X_th > +DCBTSTEP 011111 ----- ..... ..... 0011111111 - @X_ea > + > +DCBTLS 011111 ..... ..... ..... 0010100110 - @X_th > +DCBLC 011111 ..... ..... ..... 0110000110 - @X_th > + > +DCBZ 011111 ----- ..... ..... 1111110110 - @X_ea > +DCBZEP 011111 ----- ..... ..... 1111111111 - @X_ea > +ICBI 011111 ----- ..... ..... 1111010110 - @X_ea > +ICBIEP 011111 ----- ..... ..... 1111011111 - @X_ea > + > +DST 011111 ----- ..... ..... 0101010110 - @X_ea > +DSTST 011111 ----- ..... ..... 0101110110 - @X_ea > +DSS 011111 ----- ..... ..... 1100110110 - @X_ea > + > ##Extend Sign Word and Shift Left Immediate XS-form > EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS > > diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c > index 787ba2cdec..95a224e74c 100644 > --- a/target/ppc/mem_helper.c > +++ b/target/ppc/mem_helper.c > @@ -319,13 +319,13 @@ static void dcbz_common(CPUPPCState *env, target_ulong addr, > clear_helper_retaddr(); > } > > -void helper_dcbz(CPUPPCState *env, target_ulong addr, int mmu_idx) > +void helper_DCBZ(CPUPPCState *env, target_ulong addr, int mmu_idx) > { > dcbz_common(env, addr, mmu_idx, env->dcache_line_size, GETPC()); > } > > #ifdef TARGET_PPC64 > -void helper_dcbzl(CPUPPCState *env, target_ulong addr) > +void helper_DCBZL(CPUPPCState *env, target_ulong addr) > { > int dcbz_size = env->dcache_line_size; > > @@ -341,7 +341,7 @@ void helper_dcbzl(CPUPPCState *env, target_ulong addr) > } > #endif > > -void helper_icbi(CPUPPCState *env, target_ulong addr) > +void helper_ICBI(CPUPPCState *env, target_ulong addr) > { > unsigned mmu_idx = cpu_mmu_index(env_cpu(env), false); > MemOpIdx oi = make_memop_idx(MO_UL | MO_UNALN, mmu_idx); > @@ -357,7 +357,7 @@ void helper_icbi(CPUPPCState *env, target_ulong addr) > cpu_ldl_mmu(env, addr, oi, GETPC()); > } > > -void helper_icbiep(CPUPPCState *env, target_ulong addr) > +void helper_ICBIEP(CPUPPCState *env, target_ulong addr) > { > #if !defined(CONFIG_USER_ONLY) > MemOpIdx oi = make_memop_idx(MO_UL | MO_UNALN, PPC_TLB_EPID_LOAD); > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index cc9287dcc5..60c88a6153 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -4296,216 +4296,6 @@ static void gen_setb(DisasContext *ctx) > } > #endif > > -/*** Cache management ***/ > - > -/* dcbf */ > -static void gen_dcbf(DisasContext *ctx) > -{ > - /* XXX: specification says this is treated as a load by the MMU */ > - TCGv t0; > - gen_set_access_type(ctx, ACCESS_CACHE); > - t0 = tcg_temp_new(); > - gen_addr_reg_index(ctx, t0); > - gen_qemu_ld8u(ctx, t0, t0); > -} > - > -/* dcbfep (external PID dcbf) */ > -static void gen_dcbfep(DisasContext *ctx) > -{ > - /* XXX: specification says this is treated as a load by the MMU */ > - TCGv t0; > - CHK_SV(ctx); > - gen_set_access_type(ctx, ACCESS_CACHE); > - t0 = tcg_temp_new(); > - gen_addr_reg_index(ctx, t0); > - tcg_gen_qemu_ld_tl(t0, t0, PPC_TLB_EPID_LOAD, DEF_MEMOP(MO_UB)); > -} > - > -/* dcbi (Supervisor only) */ > -static void gen_dcbi(DisasContext *ctx) > -{ > -#if defined(CONFIG_USER_ONLY) > - GEN_PRIV(ctx); > -#else > - TCGv EA, val; > - > - CHK_SV(ctx); > - EA = tcg_temp_new(); > - gen_set_access_type(ctx, ACCESS_CACHE); > - gen_addr_reg_index(ctx, EA); > - val = tcg_temp_new(); > - /* XXX: specification says this should be treated as a store by the MMU */ > - gen_qemu_ld8u(ctx, val, EA); > - gen_qemu_st8(ctx, val, EA); > -#endif /* defined(CONFIG_USER_ONLY) */ > -} > - > -/* dcdst */ > -static void gen_dcbst(DisasContext *ctx) > -{ > - /* XXX: specification say this is treated as a load by the MMU */ > - TCGv t0; > - gen_set_access_type(ctx, ACCESS_CACHE); > - t0 = tcg_temp_new(); > - gen_addr_reg_index(ctx, t0); > - gen_qemu_ld8u(ctx, t0, t0); > -} > - > -/* dcbstep (dcbstep External PID version) */ > -static void gen_dcbstep(DisasContext *ctx) > -{ > - /* XXX: specification say this is treated as a load by the MMU */ > - TCGv t0; > - gen_set_access_type(ctx, ACCESS_CACHE); > - t0 = tcg_temp_new(); > - gen_addr_reg_index(ctx, t0); > - tcg_gen_qemu_ld_tl(t0, t0, PPC_TLB_EPID_LOAD, DEF_MEMOP(MO_UB)); > -} > - > -/* dcbt */ > -static void gen_dcbt(DisasContext *ctx) > -{ > - /* > - * interpreted as no-op > - * XXX: specification say this is treated as a load by the MMU but > - * does not generate any exception > - */ > -} > - > -/* dcbtep */ > -static void gen_dcbtep(DisasContext *ctx) > -{ > - /* > - * interpreted as no-op > - * XXX: specification say this is treated as a load by the MMU but > - * does not generate any exception > - */ > -} > - > -/* dcbtst */ > -static void gen_dcbtst(DisasContext *ctx) > -{ > - /* > - * interpreted as no-op > - * XXX: specification say this is treated as a load by the MMU but > - * does not generate any exception > - */ > -} > - > -/* dcbtstep */ > -static void gen_dcbtstep(DisasContext *ctx) > -{ > - /* > - * interpreted as no-op > - * XXX: specification say this is treated as a load by the MMU but > - * does not generate any exception > - */ > -} > - > -/* dcbtls */ > -static void gen_dcbtls(DisasContext *ctx) > -{ > - /* Always fails locking the cache */ > - TCGv t0 = tcg_temp_new(); > - gen_load_spr(t0, SPR_Exxx_L1CSR0); > - tcg_gen_ori_tl(t0, t0, L1CSR0_CUL); > - gen_store_spr(SPR_Exxx_L1CSR0, t0); > -} > - > -/* dcblc */ > -static void gen_dcblc(DisasContext *ctx) > -{ > - /* > - * interpreted as no-op > - */ > -} > - > -/* dcbz */ > -static void gen_dcbz(DisasContext *ctx) > -{ > - TCGv tcgv_addr = tcg_temp_new(); > - > - gen_set_access_type(ctx, ACCESS_CACHE); > - gen_addr_reg_index(ctx, tcgv_addr); > - > -#ifdef TARGET_PPC64 > - if (ctx->excp_model == POWERPC_EXCP_970 && !(ctx->opcode & 0x00200000)) { > - gen_helper_dcbzl(tcg_env, tcgv_addr); > - return; > - } > -#endif > - > - gen_helper_dcbz(tcg_env, tcgv_addr, tcg_constant_i32(ctx->mem_idx)); > -} > - > -/* dcbzep */ > -static void gen_dcbzep(DisasContext *ctx) > -{ > - TCGv tcgv_addr = tcg_temp_new(); > - > - gen_set_access_type(ctx, ACCESS_CACHE); > - gen_addr_reg_index(ctx, tcgv_addr); > - gen_helper_dcbz(tcg_env, tcgv_addr, tcg_constant_i32(PPC_TLB_EPID_STORE)); > -} > - > -/* dst / dstt */ > -static void gen_dst(DisasContext *ctx) > -{ > - if (rA(ctx->opcode) == 0) { > - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); > - } else { > - /* interpreted as no-op */ > - } > -} > - > -/* dstst /dststt */ > -static void gen_dstst(DisasContext *ctx) > -{ > - if (rA(ctx->opcode) == 0) { > - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); > - } else { > - /* interpreted as no-op */ > - } > - > -} > - > -/* dss / dssall */ > -static void gen_dss(DisasContext *ctx) > -{ > - /* interpreted as no-op */ > -} > - > -/* icbi */ > -static void gen_icbi(DisasContext *ctx) > -{ > - TCGv t0; > - gen_set_access_type(ctx, ACCESS_CACHE); > - t0 = tcg_temp_new(); > - gen_addr_reg_index(ctx, t0); > - gen_helper_icbi(tcg_env, t0); > -} > - > -/* icbiep */ > -static void gen_icbiep(DisasContext *ctx) > -{ > - TCGv t0; > - gen_set_access_type(ctx, ACCESS_CACHE); > - t0 = tcg_temp_new(); > - gen_addr_reg_index(ctx, t0); > - gen_helper_icbiep(tcg_env, t0); > -} > - > -/* Optional: */ > -/* dcba */ > -static void gen_dcba(DisasContext *ctx) > -{ > - /* > - * interpreted as no-op > - * XXX: specification say this is treated as a store by the MMU > - * but does not generate any exception > - */ > -} > - > /*** Segment register manipulation ***/ > /* Supervisor only: */ > > @@ -5746,6 +5536,255 @@ static bool trans_LQARX(DisasContext *ctx, arg_LQARX *a) > return true; > } > > +/* > + * Cache Management Instructions (decodetree) > + */ > + > +static bool trans_DCBA(DisasContext *ctx, arg_X_ea *a) > +{ > + REQUIRE_INSNS_FLAGS(ctx, CACHE_DCBA); > + return true; > +} > + > +static bool trans_DCBT(DisasContext *ctx, arg_X_th *a) > +{ > + REQUIRE_INSNS_FLAGS(ctx, CACHE); > + return true; > +} > + > +static bool trans_DCBTEP(DisasContext *ctx, arg_X_ea *a) > +{ > + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); > + return true; > +} > + > +static bool trans_DCBTST(DisasContext *ctx, arg_X_th *a) > +{ > + REQUIRE_INSNS_FLAGS(ctx, CACHE); > + return true; > +} > + > +static bool trans_DCBTSTEP(DisasContext *ctx, arg_X_ea *a) > +{ > + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); > + return true; > +} > + > +static bool trans_DCBLC(DisasContext *ctx, arg_X_th *a) > +{ > + /* Requires either PPC_BOOKE or PPC2_BOOKE206 */ > + if (!(ctx->insns_flags & PPC_BOOKE) && > + !(ctx->insns_flags2 & PPC2_BOOKE206)) { > + return false; > + } > + return true; > +} > + > +static bool trans_DSS(DisasContext *ctx, arg_X_ea *a) > +{ > + REQUIRE_INSNS_FLAGS(ctx, ALTIVEC); > + return true; > +} > + > +static bool trans_DCBTLS(DisasContext *ctx, arg_X_th *a) > +{ > + TCGv t0 = tcg_temp_new(); > + > + /* Requires either PPC_BOOKE or PPC2_BOOKE206 */ > + if (!(ctx->insns_flags & PPC_BOOKE) && > + !(ctx->insns_flags2 & PPC2_BOOKE206)) { > + return false; > + } > + > + gen_load_spr(t0, SPR_Exxx_L1CSR0); > + tcg_gen_ori_tl(t0, t0, L1CSR0_CUL); > + gen_store_spr(SPR_Exxx_L1CSR0, t0); > + > + return true; > +} > + > +static bool trans_DST(DisasContext *ctx, arg_X_ea *a) > +{ > + REQUIRE_INSNS_FLAGS(ctx, ALTIVEC); > + > + if (a->ra == 0) { > + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); > + } > + > + return true; > +} > + > +static bool trans_DSTST(DisasContext *ctx, arg_X_ea *a) > +{ > + REQUIRE_INSNS_FLAGS(ctx, ALTIVEC); > + > + if (a->ra == 0) { > + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); > + } > + > + return true; > +} > + > +static bool trans_DCBF(DisasContext *ctx, arg_X_l *a) > +{ > + TCGv EA; > + > + REQUIRE_INSNS_FLAGS(ctx, CACHE); > + > + /* > + * As per PowerISA v3.1, the L field can have values 0, 1, 3, 4, or 6. > + * Other values are Undefined Behavior (UB). > + */ > + switch (a->l) { > + case 0: /* dcbf */ > + case 1: /* dcbfl */ > + case 3: /* dcbflp */ > + case 4: /* dcbfps */ > + case 6: /* dcbstps */ > + break; > + default: > + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); > + return true; > + } > + > + gen_set_access_type(ctx, ACCESS_CACHE); > + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); > + gen_qemu_ld8u(ctx, EA, EA); > + > + return true; > +} > + > +static bool trans_DCBST(DisasContext *ctx, arg_X_ea *a) > +{ > + TCGv EA; > + > + REQUIRE_INSNS_FLAGS(ctx, CACHE); > + > + gen_set_access_type(ctx, ACCESS_CACHE); > + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); > + gen_qemu_ld8u(ctx, EA, EA); > + > + return true; > +} > + > +static bool trans_DCBFEP(DisasContext *ctx, arg_X_ea *a) > +{ > + TCGv EA; > + > + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); > + > + REQUIRE_SV(ctx); > + > + gen_set_access_type(ctx, ACCESS_CACHE); > + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); > + > + tcg_gen_qemu_ld_tl(EA, EA, PPC_TLB_EPID_LOAD, DEF_MEMOP(MO_UB)); > + > + return true; > +} > + > +static bool trans_DCBSTEP(DisasContext *ctx, arg_X_ea *a) > +{ > + TCGv EA; > + > + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); > + > + gen_set_access_type(ctx, ACCESS_CACHE); > + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); > + > + tcg_gen_qemu_ld_tl(EA, EA, PPC_TLB_EPID_LOAD, DEF_MEMOP(MO_UB)); > + > + return true; > +} > + > +static bool trans_DCBI(DisasContext *ctx, arg_X_ea *a) > +{ > + REQUIRE_INSNS_FLAGS(ctx, CACHE); > + > +#if defined(CONFIG_USER_ONLY) > + gen_priv_opc(ctx); > + return true; > +#else > + TCGv EA, val; > + > + REQUIRE_SV(ctx); > + > + gen_set_access_type(ctx, ACCESS_CACHE); > + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); > + val = tcg_temp_new(); > + > + gen_qemu_ld8u(ctx, val, EA); > + gen_qemu_st8(ctx, val, EA); > + > + return true; > +#endif > +} > + > +static bool trans_ICBI(DisasContext *ctx, arg_X_ea *a) > +{ > + TCGv EA; > + > + REQUIRE_INSNS_FLAGS(ctx, CACHE_ICBI); > + > + gen_set_access_type(ctx, ACCESS_CACHE); > + > + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); > + gen_helper_ICBI(tcg_env, EA); > + > + return true; > +} > + > +static bool trans_ICBIEP(DisasContext *ctx, arg_X_ea *a) > +{ > + TCGv EA; > + > + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); > + REQUIRE_SV(ctx); > + > + gen_set_access_type(ctx, ACCESS_CACHE); > + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); > + > + gen_helper_ICBIEP(tcg_env, EA); > + return true; > +} > + > +static bool trans_DCBZ(DisasContext *ctx, arg_X_ea *a) > +{ > + TCGv EA; > + > + REQUIRE_INSNS_FLAGS(ctx, CACHE_DCBZ); > + > + gen_set_access_type(ctx, ACCESS_CACHE); > + > + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); > + > +#if defined(TARGET_PPC64) > + if (ctx->excp_model == POWERPC_EXCP_970 && > + !(ctx->opcode & 0x00200000)) { > + gen_helper_DCBZL(tcg_env, EA); > + return true; > + } > +#endif > + > + gen_helper_DCBZ(tcg_env, EA, tcg_constant_i32(ctx->mem_idx)); > + return true; > +} > + > +static bool trans_DCBZEP(DisasContext *ctx, arg_X_ea *a) > +{ > + TCGv EA; > + > + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); > + > + REQUIRE_SV(ctx); > + > + gen_set_access_type(ctx, ACCESS_CACHE); > + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); > + > + gen_helper_DCBZ(tcg_env, EA, tcg_constant_i32(PPC_TLB_EPID_STORE)); > + return true; > +} > + > #include "translate/fixedpoint-impl.c.inc" > > #include "translate/fp-impl.c.inc" > @@ -5910,25 +5949,6 @@ GEN_HANDLER_E(mcrxrx, 0x1F, 0x00, 0x12, 0x007FF801, PPC_NONE, PPC2_ISA300), > #endif > GEN_HANDLER(mtmsr, 0x1F, 0x12, 0x04, 0x001EF801, PPC_MISC), > GEN_HANDLER(mtspr, 0x1F, 0x13, 0x0E, 0x00000000, PPC_MISC), > -GEN_HANDLER(dcbf, 0x1F, 0x16, 0x02, 0x03C00001, PPC_CACHE), > -GEN_HANDLER_E(dcbfep, 0x1F, 0x1F, 0x03, 0x03C00001, PPC_NONE, PPC2_BOOKE206), > -GEN_HANDLER(dcbi, 0x1F, 0x16, 0x0E, 0x03E00001, PPC_CACHE), > -GEN_HANDLER(dcbst, 0x1F, 0x16, 0x01, 0x03E00001, PPC_CACHE), > -GEN_HANDLER_E(dcbstep, 0x1F, 0x1F, 0x01, 0x03E00001, PPC_NONE, PPC2_BOOKE206), > -GEN_HANDLER(dcbt, 0x1F, 0x16, 0x08, 0x00000001, PPC_CACHE), > -GEN_HANDLER_E(dcbtep, 0x1F, 0x1F, 0x09, 0x00000001, PPC_NONE, PPC2_BOOKE206), > -GEN_HANDLER(dcbtst, 0x1F, 0x16, 0x07, 0x00000001, PPC_CACHE), > -GEN_HANDLER_E(dcbtstep, 0x1F, 0x1F, 0x07, 0x00000001, PPC_NONE, PPC2_BOOKE206), > -GEN_HANDLER_E(dcbtls, 0x1F, 0x06, 0x05, 0x02000001, PPC_BOOKE, PPC2_BOOKE206), > -GEN_HANDLER_E(dcblc, 0x1F, 0x06, 0x0c, 0x02000001, PPC_BOOKE, PPC2_BOOKE206), > -GEN_HANDLER(dcbz, 0x1F, 0x16, 0x1F, 0x03C00001, PPC_CACHE_DCBZ), > -GEN_HANDLER_E(dcbzep, 0x1F, 0x1F, 0x1F, 0x03C00001, PPC_NONE, PPC2_BOOKE206), > -GEN_HANDLER(dst, 0x1F, 0x16, 0x0A, 0x01800001, PPC_ALTIVEC), > -GEN_HANDLER(dstst, 0x1F, 0x16, 0x0B, 0x01800001, PPC_ALTIVEC), > -GEN_HANDLER(dss, 0x1F, 0x16, 0x19, 0x019FF801, PPC_ALTIVEC), > -GEN_HANDLER(icbi, 0x1F, 0x16, 0x1E, 0x03E00001, PPC_CACHE_ICBI), > -GEN_HANDLER_E(icbiep, 0x1F, 0x1F, 0x1E, 0x03E00001, PPC_NONE, PPC2_BOOKE206), > -GEN_HANDLER(dcba, 0x1F, 0x16, 0x17, 0x03E00001, PPC_CACHE_DCBA), > GEN_HANDLER(mfsr, 0x1F, 0x13, 0x12, 0x0010F801, PPC_SEGMENT), > GEN_HANDLER(mfsrin, 0x1F, 0x13, 0x14, 0x001F0001, PPC_SEGMENT), > GEN_HANDLER(mtsr, 0x1F, 0x12, 0x06, 0x0010F801, PPC_SEGMENT),