ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/ppc: Clean up ifdefs in excp_helper.c, part 3 

Concatenate #if blocks that are ending then beginning on the next line
again.

Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
BALATON Zoltan 2024-02-27 16:08:10 +01:00 committed by Nicholas Piggin
parent 754920c7e6
commit 5ca958cf82
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/ppc/excp_helper.c
View File

@ -2553,10 +2553,8 @@ void helper_raise_exception(CPUPPCState *env, uint32_t exception)
{ {
raise_exception_err_ra(env, exception, 0, 0); raise_exception_err_ra(env, exception, 0, 0);
} }
#endif /* CONFIG_TCG */
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
#ifdef CONFIG_TCG
void helper_store_msr(CPUPPCState *env, target_ulong val) void helper_store_msr(CPUPPCState *env, target_ulong val)
{ {
uint32_t excp = hreg_store_msr(env, val, 0); uint32_t excp = hreg_store_msr(env, val, 0);
@ -2661,9 +2659,7 @@ void helper_hrfid(CPUPPCState *env)
{ {
do_rfi(env, env->spr[SPR_HSRR0], env->spr[SPR_HSRR1]); 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) void helper_rfebb(CPUPPCState *env, target_ulong s)
{ {
target_ulong msr = env->msr; target_ulong msr = env->msr;
@ -2763,10 +2759,8 @@ void helper_rfmci(CPUPPCState *env)
/* FIXME: choose CSRR1 or MCSRR1 based on cpu type */ /* FIXME: choose CSRR1 or MCSRR1 based on cpu type */
do_rfi(env, env->spr[SPR_BOOKE_MCSRR0], env->spr[SPR_BOOKE_MCSRR1]); do_rfi(env, env->spr[SPR_BOOKE_MCSRR0], env->spr[SPR_BOOKE_MCSRR1]);
} }
#endif /* CONFIG_TCG */ #endif /* !CONFIG_USER_ONLY */
#endif /* !defined(CONFIG_USER_ONLY) */
#ifdef CONFIG_TCG
void helper_tw(CPUPPCState *env, target_ulong arg1, target_ulong arg2, void helper_tw(CPUPPCState *env, target_ulong arg1, target_ulong arg2,
uint32_t flags) uint32_t flags)
{ {
@ -2794,9 +2788,7 @@ void helper_td(CPUPPCState *env, target_ulong arg1, target_ulong arg2,
} }
} }
#endif /* TARGET_PPC64 */ #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) static uint32_t helper_SIMON_LIKE_32_64(uint32_t x, uint64_t key, uint32_t lane)
{ {
const uint16_t c = 0xfffc; const uint16_t c = 0xfffc;
@ -2907,11 +2899,8 @@ HELPER_HASH(HASHST, env->spr[SPR_HASHKEYR], true, NPHIE)
HELPER_HASH(HASHCHK, env->spr[SPR_HASHKEYR], false, NPHIE) HELPER_HASH(HASHCHK, env->spr[SPR_HASHKEYR], false, NPHIE)
HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true, PHIE) HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true, PHIE)
HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false, PHIE) HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false, PHIE)
#endif /* CONFIG_TCG */
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
#ifdef CONFIG_TCG
/* Embedded.Processor Control */ /* Embedded.Processor Control */
static int dbell2irq(target_ulong rb) static int dbell2irq(target_ulong rb)
{ {
@ -3258,5 +3247,5 @@ bool ppc_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp)
return false; return false;
} }
#endif /* CONFIG_TCG */
#endif /* !CONFIG_USER_ONLY */ #endif /* !CONFIG_USER_ONLY */
#endif /* CONFIG_TCG */