| Message ID | 2ae612eeb7f7712a4a3d1d13e08d218fb0a04e0b.1705614747.git.balaton@eik.bme.hu |
|---|---|
| State | New |
| Headers | show |
| Series | Misc clean ups to target/ppc exception handling | expand |
On 1/19/24 03:31, BALATON Zoltan wrote: > Concatenate #if blocks that are ending then beginning on the next line > again. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com> > --- > target/ppc/excp_helper.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 2d4a72883f..5124c3e6b5 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -2496,10 +2496,8 @@ void helper_raise_exception(CPUPPCState *env, uint32_t exception) > { > raise_exception_err_ra(env, exception, 0, 0); > } > -#endif /* CONFIG_TCG */ > > #ifndef CONFIG_USER_ONLY > -#ifdef CONFIG_TCG > void helper_store_msr(CPUPPCState *env, target_ulong val) > { > uint32_t excp = hreg_store_msr(env, val, 0); > @@ -2605,9 +2603,7 @@ void helper_hrfid(CPUPPCState *env) > { > do_rfi(env, env->spr[SPR_HSRR0], env->spr[SPR_HSRR1]); > } > -#endif /* TARGET_PPC64 */ > > -#ifdef TARGET_PPC64 > void helper_rfebb(CPUPPCState *env, target_ulong s) > { > target_ulong msr = env->msr; > @@ -2707,10 +2703,8 @@ void helper_rfmci(CPUPPCState *env) > /* FIXME: choose CSRR1 or MCSRR1 based on cpu type */ > do_rfi(env, env->spr[SPR_BOOKE_MCSRR0], env->spr[SPR_BOOKE_MCSRR1]); > } > -#endif /* CONFIG_TCG */ > -#endif /* !defined(CONFIG_USER_ONLY) */ > +#endif /* !CONFIG_USER_ONLY */ > > -#ifdef CONFIG_TCG > void helper_tw(CPUPPCState *env, target_ulong arg1, target_ulong arg2, > uint32_t flags) > { > @@ -2738,9 +2732,7 @@ void helper_td(CPUPPCState *env, target_ulong arg1, target_ulong arg2, > } > } > #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) > { > const uint16_t c = 0xfffc; > @@ -2851,11 +2843,8 @@ HELPER_HASH(HASHST, env->spr[SPR_HASHKEYR], true, NPHIE) > HELPER_HASH(HASHCHK, env->spr[SPR_HASHKEYR], false, NPHIE) > HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true, PHIE) > HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false, PHIE) > -#endif /* CONFIG_TCG */ > > #ifndef CONFIG_USER_ONLY > -#ifdef CONFIG_TCG > - > /* Embedded.Processor Control */ > static int dbell2irq(target_ulong rb) > { > @@ -3197,5 +3186,5 @@ bool ppc_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp) > return false; > } > > -#endif /* CONFIG_TCG */ > #endif /* !CONFIG_USER_ONLY */ > +#endif /* CONFIG_TCG */
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 2d4a72883f..5124c3e6b5 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2496,10 +2496,8 @@ void helper_raise_exception(CPUPPCState *env, uint32_t exception) { raise_exception_err_ra(env, exception, 0, 0); } -#endif /* CONFIG_TCG */ #ifndef CONFIG_USER_ONLY -#ifdef CONFIG_TCG void helper_store_msr(CPUPPCState *env, target_ulong val) { uint32_t excp = hreg_store_msr(env, val, 0); @@ -2605,9 +2603,7 @@ void helper_hrfid(CPUPPCState *env) { do_rfi(env, env->spr[SPR_HSRR0], env->spr[SPR_HSRR1]); } -#endif /* TARGET_PPC64 */ -#ifdef TARGET_PPC64 void helper_rfebb(CPUPPCState *env, target_ulong s) { target_ulong msr = env->msr; @@ -2707,10 +2703,8 @@ void helper_rfmci(CPUPPCState *env) /* FIXME: choose CSRR1 or MCSRR1 based on cpu type */ do_rfi(env, env->spr[SPR_BOOKE_MCSRR0], env->spr[SPR_BOOKE_MCSRR1]); } -#endif /* CONFIG_TCG */ -#endif /* !defined(CONFIG_USER_ONLY) */ +#endif /* !CONFIG_USER_ONLY */ -#ifdef CONFIG_TCG void helper_tw(CPUPPCState *env, target_ulong arg1, target_ulong arg2, uint32_t flags) { @@ -2738,9 +2732,7 @@ void helper_td(CPUPPCState *env, target_ulong arg1, target_ulong arg2, } } #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) { const uint16_t c = 0xfffc; @@ -2851,11 +2843,8 @@ HELPER_HASH(HASHST, env->spr[SPR_HASHKEYR], true, NPHIE) HELPER_HASH(HASHCHK, env->spr[SPR_HASHKEYR], false, NPHIE) HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true, PHIE) HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false, PHIE) -#endif /* CONFIG_TCG */ #ifndef CONFIG_USER_ONLY -#ifdef CONFIG_TCG - /* Embedded.Processor Control */ static int dbell2irq(target_ulong rb) { @@ -3197,5 +3186,5 @@ bool ppc_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp) return false; } -#endif /* CONFIG_TCG */ #endif /* !CONFIG_USER_ONLY */ +#endif /* CONFIG_TCG */
Concatenate #if blocks that are ending then beginning on the next line again. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- target/ppc/excp_helper.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)