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 lists.gnu.org (lists.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 4364BC48BEB for ; Thu, 22 Feb 2024 09:32:48 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rd5RP-0004Zp-Nc; Thu, 22 Feb 2024 04:32:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rd5RO-0004ZX-FW; Thu, 22 Feb 2024 04:32:30 -0500 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 1rd5RI-0003mW-M1; Thu, 22 Feb 2024 04:32:30 -0500 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41M9Vhe1024481; Thu, 22 Feb 2024 09:32:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=KQlDVNIIN4NVoF4MTWYUSaW+/xTfDN8QtHaQgugeCgo=; b=Y4DdDSgYi9mBMo2gmFXEqpJ6WfCm/FLstcMYlPEJTE+ZuHYg2iJicTN/MXYEu7cco5Jq QPy5FlBHlhM1gsFphd44IvRXGNOYrAIhY1v8PfPfRkdrsBDOhajuzXhxxHOrUvDb5qzN 9HQ2zkkLTQFJS5UWHMBmd86gHptRAiDo+N1Jvp0Sm+75Or+kkt09l/IEbwPEIWal3nk1 DfszdHFxrkEwufbI8e6FpYDXJFKzRAYeFSFLez9KJ0ba5RGnstYo2Rl5FXo7xJCYqSyL d6kTx3DSuOd2CBWfSVrx7Kb++Ackuo7hB9t2NuEkVbbAYcWUMgllIKuVaDrr0iYlrC5Q 7g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3we3c8gjpr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 22 Feb 2024 09:32:07 +0000 Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 41M9W6VU028314; Thu, 22 Feb 2024 09:32:06 GMT 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 3we3c8gjk0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 22 Feb 2024 09:32:06 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 41M805jq003671; Thu, 22 Feb 2024 09:31:57 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3wb74twfqe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 22 Feb 2024 09:31:57 +0000 Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 41M9VsJj22086282 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 09:31:56 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7AAC55806F; Thu, 22 Feb 2024 09:31:54 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EE2CA58079; Thu, 22 Feb 2024 09:31:50 +0000 (GMT) Received: from [9.171.80.93] (unknown [9.171.80.93]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Thu, 22 Feb 2024 09:31:50 +0000 (GMT) Message-ID: Date: Thu, 22 Feb 2024 15:01:48 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 6/9] target/ppc: Clean up ifdefs in excp_helper.c, part 1 Content-Language: en-US To: BALATON Zoltan , qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Nicholas Piggin , Daniel Henrique Barboza , clg@kaod.org References: <8d5170ee27f9c0b982b3ad09f08dd1ee2eba575f.1705614747.git.balaton@eik.bme.hu> From: Harsh Prateek Bora In-Reply-To: <8d5170ee27f9c0b982b3ad09f08dd1ee2eba575f.1705614747.git.balaton@eik.bme.hu> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: m9wcr28fQSQd4I_H41KVh4bUQD7mSbHH X-Proofpoint-ORIG-GUID: LjmVgoNY3deGR5c8o_wJBYYxXePKbi-q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-22_06,2024-02-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 impostorscore=0 adultscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402220075 Received-SPF: pass client-ip=148.163.158.5; envelope-from=harshpb@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 1/19/24 03:31, BALATON Zoltan wrote: > Use #ifdef, #ifndef for brevity and add comments to #endif that are > more than a few lines apart for clarity. > > Signed-off-by: BALATON Zoltan Reviewed-by: Harsh Prateek Bora > --- > target/ppc/excp_helper.c | 49 ++++++++++++++++++++-------------------- > 1 file changed, 24 insertions(+), 25 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 035a9fd968..d8eab4ff6c 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -35,7 +35,7 @@ > > /*****************************************************************************/ > /* Exception processing */ > -#if !defined(CONFIG_USER_ONLY) > +#ifndef CONFIG_USER_ONLY > > static const char *powerpc_excp_name(int excp) > { > @@ -186,7 +186,7 @@ static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int excp) > env->error_code); > } > > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > static int powerpc_reset_wakeup(CPUPPCState *env, int excp, target_ulong *msr) > { > /* We no longer are in a PM state */ > @@ -380,7 +380,7 @@ static void ppc_excp_apply_ail(PowerPCCPU *cpu, int excp, target_ulong msr, > } > } > } > -#endif > +#endif /* TARGET_PPC64 */ > > static void powerpc_reset_excp_state(PowerPCCPU *cpu) > { > @@ -1123,7 +1123,7 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp) > break; > } > > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > if (env->spr[SPR_BOOKE_EPCR] & EPCR_ICM) { > /* Cat.64-bit: EPCR.ICM is copied to MSR.CM */ > new_msr |= (target_ulong)1 << MSR_CM; > @@ -1537,7 +1537,7 @@ static inline void powerpc_excp_books(PowerPCCPU *cpu, int excp) > { > g_assert_not_reached(); > } > -#endif > +#endif /* TARGET_PPC64 */ > > static void powerpc_excp(PowerPCCPU *cpu, int excp) > { > @@ -1588,7 +1588,7 @@ void ppc_cpu_do_interrupt(CPUState *cs) > powerpc_excp(cpu, cs->exception_index); > } > > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > #define P7_UNUSED_INTERRUPTS \ > (PPC_INTERRUPT_RESET | PPC_INTERRUPT_HVIRT | PPC_INTERRUPT_CEXT | \ > PPC_INTERRUPT_WDT | PPC_INTERRUPT_CDOORBELL | PPC_INTERRUPT_FIT | \ > @@ -1919,7 +1919,7 @@ static int p9_next_unmasked_interrupt(CPUPPCState *env) > > return 0; > } > -#endif > +#endif /* TARGET_PPC64 */ > > static int ppc_next_unmasked_interrupt_generic(CPUPPCState *env) > { > @@ -2036,7 +2036,7 @@ static int ppc_next_unmasked_interrupt_generic(CPUPPCState *env) > static int ppc_next_unmasked_interrupt(CPUPPCState *env) > { > switch (env->excp_model) { > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > case POWERPC_EXCP_POWER7: > return p7_next_unmasked_interrupt(env); > case POWERPC_EXCP_POWER8: > @@ -2075,7 +2075,7 @@ void ppc_maybe_interrupt(CPUPPCState *env) > } > } > > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > static void p7_deliver_interrupt(CPUPPCState *env, int interrupt) > { > PowerPCCPU *cpu = env_archcpu(env); > @@ -2277,7 +2277,7 @@ static void p9_deliver_interrupt(CPUPPCState *env, int interrupt) > interrupt); > } > } > -#endif > +#endif /* TARGET_PPC64 */ > > static void ppc_deliver_interrupt_generic(CPUPPCState *env, int interrupt) > { > @@ -2386,7 +2386,7 @@ static void ppc_deliver_interrupt_generic(CPUPPCState *env, int interrupt) > static void ppc_deliver_interrupt(CPUPPCState *env, int interrupt) > { > switch (env->excp_model) { > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > case POWERPC_EXCP_POWER7: > p7_deliver_interrupt(env, interrupt); > break; > @@ -2496,9 +2496,9 @@ void helper_raise_exception(CPUPPCState *env, uint32_t exception) > { > raise_exception_err_ra(env, exception, 0, 0); > } > -#endif > +#endif /* CONFIG_TCG */ > > -#if !defined(CONFIG_USER_ONLY) > +#ifndef CONFIG_USER_ONLY > #ifdef CONFIG_TCG > void helper_store_msr(CPUPPCState *env, target_ulong val) > { > @@ -2515,7 +2515,7 @@ void helper_ppc_maybe_interrupt(CPUPPCState *env) > ppc_maybe_interrupt(env); > } > > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > void helper_scv(CPUPPCState *env, uint32_t lev) > { > if (env->spr[SPR_FSCR] & (1ull << FSCR_SCV)) { > @@ -2544,7 +2544,7 @@ void helper_pminsn(CPUPPCState *env, uint32_t insn) > > ppc_maybe_interrupt(env); > } > -#endif /* defined(TARGET_PPC64) */ > +#endif /* TARGET_PPC64 */ > > static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr) > { > @@ -2555,7 +2555,7 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr) > if (env->flags & POWERPC_FLAG_TGPR) > msr &= ~(1ULL << MSR_TGPR); > > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > /* Switching to 32-bit ? Crop the nip */ > if (!msr_is_64bit(env, msr)) { > nip = (uint32_t)nip; > @@ -2584,7 +2584,7 @@ void helper_rfi(CPUPPCState *env) > do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1] & 0xfffffffful); > } > > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > void helper_rfid(CPUPPCState *env) > { > /* > @@ -2605,7 +2605,7 @@ void helper_hrfid(CPUPPCState *env) > { > do_rfi(env, env->spr[SPR_HSRR0], env->spr[SPR_HSRR1]); > } > -#endif > +#endif /* TARGET_PPC64 */ > > #if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) > void helper_rfebb(CPUPPCState *env, target_ulong s) > @@ -2682,7 +2682,7 @@ void raise_ebb_perfm_exception(CPUPPCState *env) > > do_ebb(env, POWERPC_EXCP_PERFM_EBB); > } > -#endif > +#endif /* defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) */ > > /*****************************************************************************/ > /* Embedded PowerPC specific helpers */ > @@ -2724,7 +2724,7 @@ void helper_tw(CPUPPCState *env, target_ulong arg1, target_ulong arg2, > } > } > > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > void helper_td(CPUPPCState *env, target_ulong arg1, target_ulong arg2, > uint32_t flags) > { > @@ -2737,8 +2737,8 @@ void helper_td(CPUPPCState *env, target_ulong arg1, target_ulong arg2, > POWERPC_EXCP_TRAP, GETPC()); > } > } > -#endif > -#endif > +#endif /* TARGET_PPC64 */ > +#endif /* CONFIG_TCG */ > > #ifdef CONFIG_TCG > static uint32_t helper_SIMON_LIKE_32_64(uint32_t x, uint64_t key, uint32_t lane) > @@ -2853,8 +2853,7 @@ HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true, PHIE) > HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false, PHIE) > #endif /* CONFIG_TCG */ > > -#if !defined(CONFIG_USER_ONLY) > - > +#ifndef CONFIG_USER_ONLY > #ifdef CONFIG_TCG > > /* Embedded.Processor Control */ > @@ -2963,7 +2962,7 @@ void helper_book3s_msgsnd(target_ulong rb) > book3s_msgsnd_common(pir, PPC_INTERRUPT_HDOORBELL); > } > > -#if defined(TARGET_PPC64) > +#ifdef TARGET_PPC64 > void helper_book3s_msgclrp(CPUPPCState *env, target_ulong rb) > { > helper_hfscr_facility_check(env, HFSCR_MSGP, "msgclrp", HFSCR_IC_MSGP);