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 D2F59C5B572 for ; Mon, 17 Aug 2026 15:29:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wvzGc-0001XW-Jd; Mon, 17 Aug 2026 11:28:52 -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 1wvzG9-0001UJ-Ge; Mon, 17 Aug 2026 11:28:24 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wvzG5-0005AV-Hf; Mon, 17 Aug 2026 11:28:20 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67HCW3hB3722411; Mon, 17 Aug 2026 15:28:15 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=4WLOLdj17ToWIs/yfTLzJ1pYC6UipXLf6so6UcVJqaw=; b=EnT8LLLbvt+C mr85RzgBQpglwhlyU37UubtpMhftT33gxspWhp+otZwJ4HIS3PeYykOQhQFJ3no9 he2ADgpeXeFHUZeth/RzuR4xFzxpuHMztsA9CDjZKThV5z2fHZOfG9rxOjWwpJ6A w7v6A/vQhjTZGMWbVLqVCWck1EYmwY6KU8Frylx54y3EupKdlqkmz71Mtja5/8Nn wVZLTkVUTQH0XvapnPQelhRR3XsOdjBD1FPdxssLLJ6mPrF0PJVMA07Arc9l6g0v D266I2J46YTZgRhEztwUhgoUFD+L7lUtNbj5VbFG3i3kpi+KLigx8b3xj8ch9vKi hWkxOmbybg== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4g2fsqjyu1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Aug 2026 15:28:14 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67HFQUQx029921; Mon, 17 Aug 2026 15:28:13 GMT Received: from smtprelay02.dal12v.mail.ibm.com ([172.16.1.4]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4g32epxr8e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Aug 2026 15:28:13 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67HFSCDS21168810 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Aug 2026 15:28:12 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7D1B25805A; Mon, 17 Aug 2026 15:28:12 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CBE2058054; Mon, 17 Aug 2026 15:28:11 +0000 (GMT) Received: from mambor8.rchland.ibm.com (unknown [9.10.239.198]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 17 Aug 2026 15:28:11 +0000 (GMT) Message-ID: <50e8c63008a6b54170f8158dbdf969121bc0f051.camel@linux.ibm.com> Subject: Re: [PATCH 5/7] target/ppc: Use PPC2_ISA207 instead of PPC2_ISA207S From: Miles Glenn To: Chinmay Rath , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, npiggin@gmail.com, harshpb@linux.ibm.com, tommusta@gmail.com Cc: richard.henderson@linaro.org, shivangu@linux.ibm.com Date: Mon, 17 Aug 2026 10:28:11 -0500 In-Reply-To: <20260715125634.2107320-6-rathc@linux.ibm.com> References: <20260715125634.2107320-1-rathc@linux.ibm.com> <20260715125634.2107320-6-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-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODE3MDExNSBTYWx0ZWRfX7BPHxzaU4K+i ir3a8hpLKW0tlrQoQQp0hnxBoAqldvkUACFqQ97GSeW6Levzltzw6KDoNcrx3ZCG5HQ7pBP7h1S YfPEgmaS1ILRiQUXNtcv5vSbhEga2DidLlgLwoM2YcnKO5a2TYSbF/D2k584xN4oqOj/VaWmraU +XzQC1t/agEZV1LUAKSYTd2qsyj22/plJaYdwczZKLokyYS+zXvE+qJhfoeWWHzlS3seOm1q9Oe x5ouxagALzO8K8RwBf+vsr3eJt/mdCc7y1ixSTz7RtyC4IeL89hdaJGdint05ztIW9YzCtDNjEI hEMECHOGMhZaPrNzgx+lwDxTynFkTG54+vjLLTSNqA8zympgc7KMDSBr+EH8jxBsaLFXHnvYTsx sQzZMjFrSeRFXfgqzJ0zRsc+/DtzikHK9PT5mF2cw12/ykD5EvpV5ksLd8gAneAeh9JXPjXz2rs ZO9FolC62t0h/RbtO+g== X-Proofpoint-ORIG-GUID: KhLq0Htv2vVeH55uFq5hZQPSCk5rPasa X-Proofpoint-Spam-Info: AW1haW4tMjYwODE3MDExNSBTYWx0ZWRfX4gGdu8nP3zRy zYWqbQEIvX5Ga4iH1I9N+kD7z+7jcmrLuqthal7Vfz3VCDHQiSZB8tRDMtoE7x5K5Cm7fHhdjjU /mNYfG1IRbiImD2V02DSgEEaFkuGSjA= X-Authority-Analysis: v=2.4 cv=DJe/JSNb c=1 sm=1 tr=0 ts=6a83288e cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=r_zDgoJseczMJY6lUjUA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-GUID: Krb3EXKkbMIzbliAwCX4snjDJknypsfS 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-17_01,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 spamscore=0 clxscore=1011 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608170115 Received-SPF: pass client-ip=148.163.156.1; envelope-from=milesg@linux.ibm.com; helo=mx0a-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_H4=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 Wed, 2026-07-15 at 18:26 +0530, Chinmay Rath wrote: > PPC2_ISA207S is only ever set in the CPUPPCState's insns_flags2 > alongside PPC2_ISA207. Checks made by PPC2_ISA207S could be > replaced with PPC2_ISA207, hence rendering is useless and apt for > removal. This patch does the same. > > Signed-off-by: Chinmay Rath > --- > hw/ppc/spapr_caps.c | 2 +- > linux-user/ppc/elfload.c | 2 +- > target/ppc/cpu.h | 5 +---- > target/ppc/cpu_init.c | 3 +-- > target/ppc/cpu_init.h | 2 +- > target/ppc/tcg-excp_helper.c | 8 ++++---- > target/ppc/translate.c | 6 +++--- > target/ppc/translate/bhrb-impl.c.inc | 4 ++-- > target/ppc/translate/branch-impl.c.inc | 2 +- > target/ppc/translate/processor-ctrl-impl.c.inc | 8 ++++---- > 10 files changed, 19 insertions(+), 23 deletions(-) > > diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c > index f4a26a85b5..0d659e9b02 100644 > --- a/hw/ppc/spapr_caps.c > +++ b/hw/ppc/spapr_caps.c > @@ -676,7 +676,7 @@ static void cap_ail_mode_3_apply(SpaprMachineState *spapr, > > if (tcg_enabled()) { > /* AIL-3 is only supported on POWER8 and above CPUs. */ > - if (!(pcc->insns_flags2 & PPC2_ISA207S)) { > + if (!(pcc->insns_flags2 & PPC2_ISA207)) { > error_setg(errp, "TCG only supports cap-ail-mode-3 on POWER8 and later CPUs"); > error_append_hint(errp, "Try appending -machine cap-ail-mode-3=off\n"); > return; > diff --git a/linux-user/ppc/elfload.c b/linux-user/ppc/elfload.c > index 8c40f1a663..7bf49e7c0b 100644 > --- a/linux-user/ppc/elfload.c > +++ b/linux-user/ppc/elfload.c > @@ -116,7 +116,7 @@ abi_ulong get_elf_hwcap2(CPUState *cs) > do { if (cpu->env.insns_flags2 & flag) { features |= feature; } } while (0) > > GET_FEATURE(PPC_ISEL, QEMU_PPC_FEATURE2_HAS_ISEL); > - GET_FEATURE2((PPC2_ISA207 | PPC2_ISA207S), (QEMU_PPC_FEATURE2_ARCH_2_07 | > + GET_FEATURE2(PPC2_ISA207, (QEMU_PPC_FEATURE2_ARCH_2_07 | > QEMU_PPC_FEATURE2_VEC_CRYPTO | QEMU_PPC_FEATURE2_HAS_TAR)); > GET_FEATURE2(PPC2_ISA300, QEMU_PPC_FEATURE2_ARCH_3_00 | > QEMU_PPC_FEATURE2_DARN | QEMU_PPC_FEATURE2_HAS_IEEE128); > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 00676cea2b..4a77607f80 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -2577,8 +2577,6 @@ enum { > PPC2_FP_CVT_ISA206 = 0x0000000000000400ULL, > /* ISA 2.06B floating point test instructions */ > PPC2_FP_TST_ISA206 = 0x0000000000000800ULL, > - /* PowerISA 2.07 Book3s specification */ > - PPC2_ISA207S = 0x0000000000008000ULL, > /* Double precision floating point conversion for signed integer 64 */ > PPC2_FP_CVT_S64 = 0x0000000000010000ULL, > /* Transactional Memory (ISA 2.07, Book II) */ > @@ -2603,8 +2601,7 @@ enum { > #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ > PPC2_ISA205 | PPC2_ISA207 | PPC2_PERM_ISA206 | \ > PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ > - PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ > - PPC2_ISA207S | PPC2_DFP | \ > + PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_DFP | \ > PPC2_FP_CVT_S64 | PPC2_TM | PPC2_PM_ISA206 | \ > PPC2_ISA300 | PPC2_ISA310 | PPC2_MEM_LWSYNC | \ > PPC2_BCDA_ISA206 | PPC2_PPE42 | PPC2_PPE42X | \ > diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c > index 7a5cef32b7..0cb054953d 100644 > --- a/target/ppc/cpu_init.c > +++ b/target/ppc/cpu_init.c > @@ -6349,8 +6349,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, const void *data) > pcc->insns_flags2 = PPC2_VSX | PPC2_ISA207 | PPC2_DFP | PPC2_DBRX | > PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | > PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | > - PPC2_FP_TST_ISA206 | > - PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | > + PPC2_FP_TST_ISA206 | PPC2_ISA205 | PPC2_FP_CVT_S64 | > PPC2_TM | PPC2_PM_ISA206 | PPC2_MEM_LWSYNC | > PPC2_BCDA_ISA206; > pcc->msr_mask = (1ull << MSR_SF) | > diff --git a/target/ppc/cpu_init.h b/target/ppc/cpu_init.h > index 73f014c82a..4ba559d8af 100644 > --- a/target/ppc/cpu_init.h > +++ b/target/ppc/cpu_init.h > @@ -18,7 +18,7 @@ > (PPC2_VSX | PPC2_ISA207 | PPC2_DFP | PPC2_DBRX | \ > PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ > PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_ISA205 | \ > - PPC2_ISA207S | PPC2_FP_CVT_S64 | PPC2_ISA300 | PPC2_PRCNTL | \ > + PPC2_FP_CVT_S64 | PPC2_ISA300 | PPC2_PRCNTL | \ > PPC2_MEM_LWSYNC | PPC2_BCDA_ISA206) > > #define PPC_INSNS_FLAGS2_POWER9 \ > diff --git a/target/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c > index d06d3f8642..93aedb0c8e 100644 > --- a/target/ppc/tcg-excp_helper.c > +++ b/target/ppc/tcg-excp_helper.c > @@ -314,7 +314,7 @@ void ppc_cpu_debug_excp_handler(CPUState *cs) > #if defined(TARGET_PPC64) > CPUPPCState *env = cpu_env(cs); > > - if (env->insns_flags2 & PPC2_ISA207S) { > + if (env->insns_flags2 & PPC2_ISA207) { > if (cs->watchpoint_hit) { > if (cs->watchpoint_hit->flags & BP_CPU) { > env->spr[SPR_DAR] = cs->watchpoint_hit->hitaddr; > @@ -336,7 +336,7 @@ bool ppc_cpu_debug_check_breakpoint(CPUState *cs) > #if defined(TARGET_PPC64) > CPUPPCState *env = cpu_env(cs); > > - if (env->insns_flags2 & PPC2_ISA207S) { > + if (env->insns_flags2 & PPC2_ISA207) { > target_ulong priv; > > priv = env->spr[SPR_CIABR] & PPC_BITMASK(62, 63); > @@ -365,7 +365,7 @@ bool ppc_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp) > bool wt, wti, hv, sv, pr; > uint32_t dawrx; > > - if ((env->insns_flags2 & PPC2_ISA207S) && > + if ((env->insns_flags2 & PPC2_ISA207) && > (wp == env->dawr_watchpoint[0])) { > dawrx = env->spr[SPR_DAWRX0]; > } else if ((env->insns_flags2 & PPC2_ISA310) && > @@ -849,7 +849,7 @@ void helper_book3s_msgsndp(CPUPPCState *env, target_ulong rb) > void helper_book3s_trace(CPUPPCState *env, target_ulong prev_ip) > { > uint32_t error_code = 0; > - if (env->insns_flags2 & PPC2_ISA207S) { > + if (env->insns_flags2 & PPC2_ISA207) { > /* Load/store reporting, SRR1[35, 36] and SDAR, are not implemented. */ > env->spr[SPR_POWER_SIAR] = prev_ip; > error_code = PPC_BIT(33); > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index 06e8ba8ec9..8dab54ccee 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -2777,7 +2777,7 @@ static inline void gen_op_mfspr(DisasContext *ctx) > } > } else { > /* ISA 2.07 defines these as no-ops */ > - if ((ctx->insns_flags2 & PPC2_ISA207S) && > + if ((ctx->insns_flags2 & PPC2_ISA207) && > (sprn >= 808 && sprn <= 811)) { > /* This is a nop */ > return; > @@ -2843,7 +2843,7 @@ static void gen_mtspr(DisasContext *ctx) > } > } else { > /* ISA 2.07 defines these as no-ops */ > - if ((ctx->insns_flags2 & PPC2_ISA207S) && > + if ((ctx->insns_flags2 & PPC2_ISA207) && > (sprn >= 808 && sprn <= 811)) { > /* This is a nop */ > return; > @@ -4138,7 +4138,7 @@ static bool trans_LDARX(DisasContext *ctx, arg_LDARX *a) > static bool trans_LQARX(DisasContext *ctx, arg_LQARX *a) > { > REQUIRE_64BIT(ctx); > - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); > + REQUIRE_INSNS_FLAGS2(ctx, ISA207); > #if defined(TARGET_PPC64) > TCGv EA; > TCGv_i128 t16; > diff --git a/target/ppc/translate/bhrb-impl.c.inc b/target/ppc/translate/bhrb-impl.c.inc > index 3a19bc4555..4b3914a1f6 100644 > --- a/target/ppc/translate/bhrb-impl.c.inc > +++ b/target/ppc/translate/bhrb-impl.c.inc > @@ -14,7 +14,7 @@ > > static bool trans_MFBHRBE(DisasContext *ctx, arg_XFX_bhrbe *arg) > { > - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); > + REQUIRE_INSNS_FLAGS2(ctx, ISA207); > TCGv_i32 bhrbe = tcg_constant_i32(arg->bhrbe); > gen_helper_mfbhrbe(cpu_gpr[arg->rt], tcg_env, bhrbe); > return true; > @@ -22,7 +22,7 @@ static bool trans_MFBHRBE(DisasContext *ctx, arg_XFX_bhrbe *arg) > > static bool trans_CLRBHRB(DisasContext *ctx, arg_CLRBHRB *arg) > { > - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); > + REQUIRE_INSNS_FLAGS2(ctx, ISA207); > gen_helper_clrbhrb(tcg_env); > return true; > } > diff --git a/target/ppc/translate/branch-impl.c.inc b/target/ppc/translate/branch-impl.c.inc > index 44ed40422e..62025089f8 100644 > --- a/target/ppc/translate/branch-impl.c.inc > +++ b/target/ppc/translate/branch-impl.c.inc > @@ -14,7 +14,7 @@ > > static bool trans_RFEBB(DisasContext *ctx, arg_XL_s *arg) > { > - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); > + REQUIRE_INSNS_FLAGS2(ctx, ISA207); > > translator_io_start(&ctx->base); > gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_NORECORD); > diff --git a/target/ppc/translate/processor-ctrl-impl.c.inc b/target/ppc/translate/processor-ctrl-impl.c.inc > index 3b3ed3019a..155d728b02 100644 > --- a/target/ppc/translate/processor-ctrl-impl.c.inc > +++ b/target/ppc/translate/processor-ctrl-impl.c.inc > @@ -23,7 +23,7 @@ > > static bool trans_MSGCLR(DisasContext *ctx, arg_X_rb *a) > { > - if (!(ctx->insns_flags2 & PPC2_ISA207S)) { > + if (!(ctx->insns_flags2 & PPC2_ISA207)) { > /* > * Before Power ISA 2.07, processor control instructions were only > * implemented in the "Embedded.Processor Control" category. > @@ -47,7 +47,7 @@ static bool trans_MSGCLR(DisasContext *ctx, arg_X_rb *a) > > static bool trans_MSGSND(DisasContext *ctx, arg_X_rb *a) > { > - if (!(ctx->insns_flags2 & PPC2_ISA207S)) { > + if (!(ctx->insns_flags2 & PPC2_ISA207)) { > /* > * Before Power ISA 2.07, processor control instructions were only > * implemented in the "Embedded.Processor Control" category. > @@ -72,7 +72,7 @@ static bool trans_MSGSND(DisasContext *ctx, arg_X_rb *a) > static bool trans_MSGCLRP(DisasContext *ctx, arg_X_rb *a) > { > REQUIRE_64BIT(ctx); > - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); > + REQUIRE_INSNS_FLAGS2(ctx, ISA207); > REQUIRE_SV(ctx); > #if !defined(CONFIG_USER_ONLY) && defined(TARGET_PPC64) > gen_helper_book3s_msgclrp(tcg_env, cpu_gpr[a->rb]); > @@ -85,7 +85,7 @@ static bool trans_MSGCLRP(DisasContext *ctx, arg_X_rb *a) > static bool trans_MSGSNDP(DisasContext *ctx, arg_X_rb *a) > { > REQUIRE_64BIT(ctx); > - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); > + REQUIRE_INSNS_FLAGS2(ctx, ISA207); > REQUIRE_SV(ctx); > #if !defined(CONFIG_USER_ONLY) && defined(TARGET_PPC64) > gen_helper_book3s_msgsndp(tcg_env, cpu_gpr[a->rb]);