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 3CB1EC5DF9C for ; Mon, 24 Aug 2026 15:57:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyX26-0004AR-Q7; Mon, 24 Aug 2026 11:56:22 -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 1wyX24-00048F-Gk; Mon, 24 Aug 2026 11:56:20 -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 1wyX21-00014z-W6; Mon, 24 Aug 2026 11:56:20 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67OD1bvJ1958024; Mon, 24 Aug 2026 15:56: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=KvAmvgcOtfUVb6czg5SQTYlzLIoiZzN5ILACkA4BmtI=; b=sLEag8ocb6HI YDYnYG0MdXRpq6YAqAXVfrr6kCtVk6lLtgXes/ywJhaTw8HoHYdrUlajVLInA/jj IXfjgNPf3tGZr03ugvMbJszB69Esb/74Jwb2jEZVT+UlgZOtYUqd3UQxjbj2c1mi 5tPC1fqscF4I4UwLHzuDwuYErROJUVN9Fwsnhr3KLptgVDtnnK6MxLhlhwtI/8Xs UpEmPpH2QogDy76yDyYNC+86/nw/YSlw4vvGuCu7oOtlc7Lmtoo7Onr5I+h3iqfm 2AHx44FjGfAPsj3F+VbCovL3WD6G8wqPzTIfwOymvUr6LpSkNIDrz9oJOlTVJp6M ehArH3cdZQ== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4g73g4jemp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 15:56:14 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67OFfIJo030412; Mon, 24 Aug 2026 15:56:13 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4g7q3jpxg4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 15:56:13 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67OFu9Zf26215114 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 24 Aug 2026 15:56:09 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1BD2D58056; Mon, 24 Aug 2026 15:56:09 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 41C8E5803F; Mon, 24 Aug 2026 15:56:08 +0000 (GMT) Received: from mambor8.rchland.ibm.com (unknown [9.10.239.198]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 24 Aug 2026 15:56:08 +0000 (GMT) Message-ID: Subject: Re: [PATCH 29/29] target/ppc: Move system call and rfi 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, Vishal Chourasia Date: Mon, 24 Aug 2026 10:56:07 -0500 In-Reply-To: <20260820140114.327023-30-rathc@linux.ibm.com> References: <20260820140114.327023-1-rathc@linux.ibm.com> <20260820140114.327023-30-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-ORIG-GUID: nI9zDBksPwm61g-oFFeZm0MD8ZbwmucL X-Proofpoint-Spam-Info: AW1haW4tMjYwODI0MDEzMSBTYWx0ZWRfXzq+jx9x7wM/4 IK1tHLKAG7f3fhzqav4nNyfpCDfKxTCFvoxa7REPT5c1X8+LxfHUvW14fEL66QAzSpdx3478v03 jxJwwG3y9R6T3aYyxv5JzNV+8/DiF4A= X-Proofpoint-GUID: bm0BSAffja-4vmyHVkbwc6S6pxMcWgv_ X-Authority-Analysis: v=2.4 cv=JZyMa0KV c=1 sm=1 tr=0 ts=6a8c699f cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=l24Wq5Wrq7Y61RqIk6wA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI0MDEzMSBTYWx0ZWRfX5HZtNAcBgnhy XGusFzSbCooFucH/45uOHGnMDBUVeeZWY2ttp5hd8ZEUQs7Xc3qU77UoKYfGpq1dgX4AyNXJCpY 1bHjM/wEK02Rbvxe6WP9bil8v0MAlQBZ/vFkQBl+suhWWaQMzaTjGTJuMJj8wC03xXtNpon9+R6 1DtU/qDBb/97aKha58Q+hSRp9iHExsUEGoUcorngGZpWulQUayLOJpwmahDmVQ5E3DShIORkxvQ ohSkEpRFYpHRGNXtvYP6bveMz4E3vbJhodxogkoIIa825fhgOc5439Bx/dtD+CdOT2dTDa+T+9R HernV8rBiE815Ff+tjzhkAa+HpK/t7RjnKKDsSZB9yYemG2e3W3+tliRCaMOaFVHSTfo9EnVTcy MWSknqM2FIGOi91ek502ajSYb0K9LjObsnZ5BI1dNAOm+OPINm2nwEUBCVXjqWrYrSBXvmZPhd9 IZ3p5bTCKMejo5cA8qg== 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 spamscore=0 clxscore=1015 adultscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608240131 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 On Thu, 2026-08-20 at 19:30 +0530, Chinmay Rath wrote: > From: Vishal Chourasia > > Moving the following instructions to decodetree specification: > sc, scv : SC-form > rfi, rfid, rfscv, hrfid : XL-form > > This builds upon the previous work that moved mfmsr and mtmsr[d] > instructions to decodetree. > > The changes were verified by validating that the tcg ops generated by > those instructions remain the same, which were captured with the > `-d in_asm,op` flag, and also by booting a pseries qemu guest. > > This also includes improvements from review feedback: > - Rename helpers to uppercase (RFI/RFID/RFSCV/HRFID) to match ISA mnemonics > - Add TRANS64_FLAGS() macro variants > - Add REQUIRE_INSNS_FLAGS_NOT() check for flag exclusion > - Specify lev field as uint8_t in SC instruction format > - Remove redundant masking in SCV since lev is already 7-bit > - Replace TARGET_PPC64 ifdefs with REQUIRE_64BIT() macro > - Gate SC, SCV, RFI, RFID, RFSCV, and HRFID with appropriate flags > - Consolidate CONFIG_USER_ONLY guards into single block > > Signed-off-by: Vishal Chourasia > --- > target/ppc/helper.h | 8 +- > target/ppc/insn32.decode | 11 +++ > target/ppc/tcg-excp_helper.c | 8 +- > target/ppc/translate.c | 126 ++------------------------- > target/ppc/translate/misc-impl.c.inc | 100 +++++++++++++++++++++ > 5 files changed, 126 insertions(+), 127 deletions(-) > > diff --git a/target/ppc/helper.h b/target/ppc/helper.h > index 3659408c46..f24a34cfa3 100644 > --- a/target/ppc/helper.h > +++ b/target/ppc/helper.h > @@ -11,7 +11,7 @@ DEF_HELPER_4(HASHCHKP, void, env, tl, tl, tl) > #if !defined(CONFIG_USER_ONLY) > DEF_HELPER_2(store_msr, void, env, tl) > DEF_HELPER_1(ppc_maybe_interrupt, void, env) > -DEF_HELPER_1(rfi, void, env) > +DEF_HELPER_1(RFI, void, env) > DEF_HELPER_1(40x_rfci, void, env) > DEF_HELPER_1(rfci, void, env) > DEF_HELPER_1(rfdi, void, env) > @@ -19,9 +19,9 @@ DEF_HELPER_1(rfmci, void, env) > #if defined(TARGET_PPC64) > DEF_HELPER_2(scv, noreturn, env, i32) > DEF_HELPER_2(PMINSN, void, env, i32) > -DEF_HELPER_1(rfid, void, env) > -DEF_HELPER_1(rfscv, void, env) > -DEF_HELPER_1(hrfid, void, env) > +DEF_HELPER_1(RFID, void, env) > +DEF_HELPER_1(RFSCV, void, env) > +DEF_HELPER_1(HRFID, void, env) > DEF_HELPER_2(rfebb, void, env, tl) > DEF_HELPER_2(store_lpcr, void, env, tl) > DEF_HELPER_2(store_pcr, void, env, tl) > diff --git a/target/ppc/insn32.decode b/target/ppc/insn32.decode > index 7614655f72..9d6c4b550d 100644 > --- a/target/ppc/insn32.decode > +++ b/target/ppc/insn32.decode > @@ -199,6 +199,9 @@ > &X_rs_l rs l:bool > @X_rs_l ...... rs:5 .... l:1 ..... .......... . &X_rs_l > > +&SC lev:uint8_t > +@SC ...... ..... ..... .... lev:7 ... . . &SC > + > &X_uim5 xt uim:uint8_t > @X_uim5 ...... ..... ..... uim:5 .......... . &X_uim5 xt=%x_xt > > @@ -320,6 +323,14 @@ MFMSR 011111 ..... ----- ----- 0001010011 - @X_t > MTMSR 011111 ..... ---- . ----- 0010010010 - @X_rs_l > MTMSRD 011111 ..... ---- . ----- 0010110010 - @X_rs_l > > +### System Call and Return from Interrupt > +SC 010001 ----- ----- ---- ....... --- 1 - @SC > +SCV 010001 ----- ----- ---- ....... --- 0 1 @SC > +RFI 010011 ----- ----- ----- 0000110010 - > +RFID 010011 ----- ----- ----- 0000010010 - > +RFSCV 010011 ----- ----- ----- 0001010010 - > +HRFID 010011 ----- ----- ----- 0100010010 - > + > ### Fixed-Point Byte-Reverse Instructions > BRW 011111 ..... ..... ----- 0010011011 - @X_sa > BRD 011111 ..... ..... ----- 0010111011 - @X_sa > diff --git a/target/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c > index c4ffa2dfbb..d06d3f8642 100644 > --- a/target/ppc/tcg-excp_helper.c > +++ b/target/ppc/tcg-excp_helper.c > @@ -528,13 +528,13 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr) > check_tlb_flush(env, false); > } > > -void helper_rfi(CPUPPCState *env) > +void helper_RFI(CPUPPCState *env) > { > do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1] & 0xfffffffful); > } > > #ifdef TARGET_PPC64 > -void helper_rfid(CPUPPCState *env) > +void helper_RFID(CPUPPCState *env) > { > /* > * The architecture defines a number of rules for which bits can > @@ -545,12 +545,12 @@ void helper_rfid(CPUPPCState *env) > do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1]); > } > > -void helper_rfscv(CPUPPCState *env) > +void helper_RFSCV(CPUPPCState *env) > { > do_rfi(env, env->lr, env->ctr); > } > > -void helper_hrfid(CPUPPCState *env) > +void helper_HRFID(CPUPPCState *env) > { > do_rfi(env, env->spr[SPR_HSRR0], env->spr[SPR_HSRR1]); > } > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index 8950476be7..c6c87d3e33 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -2679,110 +2679,6 @@ static inline void gen_setlr(DisasContext *ctx, target_ulong nip) > tcg_gen_movi_tl(cpu_lr, nip); > } > > -/*** System linkage ***/ > - > -/* rfi (supervisor only) */ > -static void gen_rfi(DisasContext *ctx) > -{ > -#if defined(CONFIG_USER_ONLY) > - GEN_PRIV(ctx); > -#else > - /* > - * This instruction doesn't exist anymore on 64-bit server > - * processors compliant with arch 2.x > - */ > - if (is_book3s_arch2x(ctx)) { > - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); > - return; > - } > - /* Restore CPU state */ > - CHK_SV(ctx); > - translator_io_start(&ctx->base); > - gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_NORECORD); > - gen_helper_rfi(tcg_env); > - ctx->base.is_jmp = DISAS_EXIT; > -#endif > -} > - > -#if defined(TARGET_PPC64) > -static void gen_rfid(DisasContext *ctx) > -{ > -#if defined(CONFIG_USER_ONLY) > - GEN_PRIV(ctx); > -#else > - /* Restore CPU state */ > - CHK_SV(ctx); > - translator_io_start(&ctx->base); > - gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_NORECORD); > - gen_helper_rfid(tcg_env); > - ctx->base.is_jmp = DISAS_EXIT; > -#endif > -} > - > -#if !defined(CONFIG_USER_ONLY) > -static void gen_rfscv(DisasContext *ctx) > -{ > -#if defined(CONFIG_USER_ONLY) > - GEN_PRIV(ctx); > -#else > - /* Restore CPU state */ > - CHK_SV(ctx); > - translator_io_start(&ctx->base); > - gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_NORECORD); > - gen_helper_rfscv(tcg_env); > - ctx->base.is_jmp = DISAS_EXIT; > -#endif > -} > -#endif > - > -static void gen_hrfid(DisasContext *ctx) > -{ > -#if defined(CONFIG_USER_ONLY) > - GEN_PRIV(ctx); > -#else > - /* Restore CPU state */ > - CHK_HV(ctx); > - translator_io_start(&ctx->base); > - gen_helper_hrfid(tcg_env); > - ctx->base.is_jmp = DISAS_EXIT; > -#endif > -} > -#endif > - > -/* sc */ > -#if defined(CONFIG_USER_ONLY) > -#define POWERPC_SYSCALL POWERPC_EXCP_SYSCALL_USER > -#else > -#define POWERPC_SYSCALL POWERPC_EXCP_SYSCALL > -#endif > -static void gen_sc(DisasContext *ctx) > -{ > - uint32_t lev; > - > - /* > - * LEV is a 7-bit field, but the top 6 bits are treated as a reserved > - * field (i.e., ignored). ISA v3.1 changes that to 5 bits, but that is > - * for Ultravisor which TCG does not support, so just ignore the top 6. > - */ > - lev = (ctx->opcode >> 5) & 0x1; > - gen_exception_err(ctx, POWERPC_SYSCALL, lev); > -} > - > -#if defined(TARGET_PPC64) > -#if !defined(CONFIG_USER_ONLY) > -static void gen_scv(DisasContext *ctx) > -{ > - uint32_t lev = (ctx->opcode >> 5) & 0x7F; > - > - /* Set the PC back to the faulting instruction. */ > - gen_update_nip(ctx, ctx->cia); > - gen_helper_scv(tcg_env, tcg_constant_i32(lev)); > - > - ctx->base.is_jmp = DISAS_NORETURN; > -} > -#endif > -#endif > - > /*** Trap ***/ > > /* Check for unconditional traps (always or never) */ > @@ -4125,6 +4021,13 @@ static int64_t dw_compose_ea(DisasContext *ctx, int x) > #define TRANS64(NAME, FUNC, ...) \ > static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ > { REQUIRE_64BIT(ctx); return FUNC(ctx, a, ##__VA_ARGS__); } > +#define TRANS64_FLAGS(FLAGS, NAME, FUNC, ...) \ > + static bool trans_##NAME(DisasContext *ctx, arg_##NAME * a) \ > + { \ > + REQUIRE_64BIT(ctx); \ > + REQUIRE_INSNS_FLAGS(ctx, FLAGS); \ > + return FUNC(ctx, a, ##__VA_ARGS__); \ > + } > #define TRANS64_FLAGS2(FLAGS2, NAME, FUNC, ...) \ > static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ > { \ > @@ -4542,21 +4445,6 @@ GEN_HANDLER(rlwnm, 0x17, 0xFF, 0xFF, 0x00000000, PPC_INTEGER), > GEN_HANDLER_E(dform39, 0x39, 0xFF, 0xFF, 0x00000000, PPC_NONE, PPC2_ISA205), > /* handles stfdp, stxsd, stxssp */ > GEN_HANDLER_E(dform3D, 0x3D, 0xFF, 0xFF, 0x00000000, PPC_NONE, PPC2_ISA205), > -/* ISA v3.0 changed the extended opcode from 62 to 30 */ > -GEN_HANDLER(rfi, 0x13, 0x12, 0x01, 0x03FF8001, PPC_FLOW), > -#if defined(TARGET_PPC64) > -GEN_HANDLER(rfid, 0x13, 0x12, 0x00, 0x03FF8001, PPC_64B), > -#if !defined(CONFIG_USER_ONLY) > -/* Top bit of opc2 corresponds with low bit of LEV, so use two handlers */ > -GEN_HANDLER_E(scv, 0x11, 0x10, 0xFF, 0x03FFF01E, PPC_NONE, PPC2_ISA300), > -GEN_HANDLER_E(scv, 0x11, 0x00, 0xFF, 0x03FFF01E, PPC_NONE, PPC2_ISA300), > -GEN_HANDLER_E(rfscv, 0x13, 0x12, 0x02, 0x03FF8001, PPC_NONE, PPC2_ISA300), > -#endif > -GEN_HANDLER(hrfid, 0x13, 0x12, 0x08, 0x03FF8001, PPC_64H), > -#endif > -/* Top bit of opc2 corresponds with low bit of LEV, so use two handlers */ > -GEN_HANDLER(sc, 0x11, 0x11, 0xFF, 0x03FFF01D, PPC_FLOW), > -GEN_HANDLER(sc, 0x11, 0x01, 0xFF, 0x03FFF01D, PPC_FLOW), > GEN_HANDLER(mcrxr, 0x1F, 0x00, 0x10, 0x007FF801, PPC_MISC), > GEN_HANDLER(mfspr, 0x1F, 0x13, 0x0A, 0x00000001, PPC_MISC), > GEN_HANDLER(mftb, 0x1F, 0x13, 0x0B, 0x00000001, PPC_MFTB), > diff --git a/target/ppc/translate/misc-impl.c.inc b/target/ppc/translate/misc-impl.c.inc > index 54712f9b73..05757e8190 100644 > --- a/target/ppc/translate/misc-impl.c.inc > +++ b/target/ppc/translate/misc-impl.c.inc > @@ -225,3 +225,103 @@ static bool do_mtmsr(DisasContext *ctx, arg_X_rs_l *a, bool is_mtmsrd) > > TRANS_FLAGS(MISC, MTMSR, do_mtmsr, false) > TRANS64(MTMSRD, do_mtmsr, true) > + > +/* > + * System Call and Return from Interrupt Instructions > + */ > + > +static bool do_SC(DisasContext *ctx, arg_SC * a, uint32_t excp) > +{ > + uint32_t lev; > + > + /* > + * LEV is a 7-bit field, but the top 6 bits are treated as a reserved > + * field (i.e., ignored). ISA v3.1 changes that to 5 bits, but that is > + * for Ultravisor which TCG does not support, so just ignore the top 6. > + */ > + lev = a->lev & 0x1; > + gen_exception_err(ctx, excp, lev); > + return true; > +} > + > +static bool do_SCV(DisasContext *ctx, arg_SC *a) > +{ > +#if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) > + /* Set the PC back to the faulting instruction. */ > + gen_update_nip(ctx, ctx->cia); > + gen_helper_scv(tcg_env, tcg_constant_i32(a->lev)); > + > + ctx->base.is_jmp = DISAS_NORETURN; > + return true; > +#else > + gen_invalid(ctx); > + return true; > +#endif > +} > + What would prevent a 32-bit PowerPC (or PPE42) CPU from executing this instruction? 32-bit processors are allowed to run even inside the ppc64 executable. Correct me if I'm wrong, but I think you do need the REQUIRE_64BIT macro here in order to cover this case. -Glenn > +/* > + * Common helper for return-from-interrupt instructions > + */ > +enum { > + RFI = 0, > + RFID = 1, > + HRFID = 2, > + RFSCV = 3, > +}; > + > +static bool do_rfi(DisasContext *ctx, arg_RFID *a, int kind) > +{ > +#if defined(CONFIG_USER_ONLY) > + gen_priv_opc(ctx); > + return true; > +#else > + void (*helper)(TCGv_ptr); > + > + switch (kind) { > + case RFI: > + if (is_book3s_arch2x(ctx)) { > + gen_invalid(ctx); > + return true; > + } > + REQUIRE_SV(ctx); > + helper = gen_helper_RFI; > + break; > +#if defined(TARGET_PPC64) > + case HRFID: > + REQUIRE_HV(ctx); > + helper = gen_helper_HRFID; > + break; > + case RFID: > + REQUIRE_SV(ctx); > + helper = gen_helper_RFID; > + break; > + case RFSCV: > + REQUIRE_SV(ctx); > + helper = gen_helper_RFSCV; > + break; > +#endif > + default: > + gen_invalid(ctx); > + return true; > + } > + > + translator_io_start(&ctx->base); > + gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_NORECORD); > + helper(tcg_env); > + ctx->base.is_jmp = DISAS_EXIT; > + return true; > +#endif > +} > + > +#if defined(CONFIG_USER_ONLY) > +TRANS_FLAGS(FLOW, SC, do_SC, POWERPC_EXCP_SYSCALL_USER) > +#else > +TRANS_FLAGS(FLOW, SC, do_SC, POWERPC_EXCP_SYSCALL) > +#endif > + > +TRANS64_FLAGS2(ISA300, SCV, do_SCV) > + > +TRANS_FLAGS(FLOW, RFI, do_rfi, RFI) > +TRANS64(RFID, do_rfi, RFID) > +TRANS64_FLAGS(64H, HRFID, do_rfi, HRFID) > +TRANS64_FLAGS2(ISA300, RFSCV, do_rfi, RFSCV)