Skip to content

Commit

Permalink
target/ppc: Clean up ifdefs in excp_helper.c, part 1
Browse files Browse the repository at this point in the history 
Use #ifdef, #ifndef for brevity and add comments to #endif that are
more than a few lines apart for clarity.

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>
  • Loading branch information
@zbalaton @npiggin
zbalaton authored and npiggin committed Mar 12, 2024
1 parent d54b82a commit f6c2d68
Showing 1 changed file with 24 additions and 25 deletions.
49 changes: 24 additions & 25 deletions target/ppc/excp_helper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

/*****************************************************************************/
/* Exception processing */
#if !defined(CONFIG_USER_ONLY)
#ifndef CONFIG_USER_ONLY

static const char *powerpc_excp_name(int excp)
{
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -1163,7 +1163,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;
Expand Down Expand Up @@ -1594,7 +1594,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)
{
Expand Down Expand Up @@ -1645,7 +1645,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 | \
Expand Down Expand Up @@ -1976,7 +1976,7 @@ static int p9_next_unmasked_interrupt(CPUPPCState *env)

return 0;
}
#endif
#endif /* TARGET_PPC64 */

static int ppc_next_unmasked_interrupt_generic(CPUPPCState *env)
{
Expand Down Expand Up @@ -2093,7 +2093,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:
Expand Down Expand Up @@ -2132,7 +2132,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);
Expand Down Expand Up @@ -2334,7 +2334,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)
{
Expand Down Expand Up @@ -2443,7 +2443,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;
Expand Down Expand Up @@ -2553,9 +2553,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)
{
Expand All @@ -2572,7 +2572,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)) {
Expand Down Expand Up @@ -2600,7 +2600,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)
{
Expand All @@ -2611,7 +2611,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;
Expand Down Expand Up @@ -2640,7 +2640,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)
{
/*
Expand All @@ -2661,7 +2661,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)
Expand Down Expand Up @@ -2738,7 +2738,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 */
Expand Down Expand Up @@ -2780,7 +2780,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)
{
Expand All @@ -2793,8 +2793,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)
Expand Down Expand Up @@ -2909,8 +2909,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 */
Expand Down Expand Up @@ -3019,7 +3018,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);
Expand Down

0 comments on commit f6c2d68

Please sign in to comment.