Skip to contentSkip to conversation

target/ppc: Put do_rfi under a TCG-only block

PATCH In review Fabiano Rosas 3 participants 3 messages Jan 24, 2022 – Jan 25, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/ppc: Put do_rfi under a TCG-only block

The --disable-tcg build broke when do_rfi stopped being inlined.

Fixes 62e79ef914 ("target/ppc: Remove static inline")
---
 target/ppc/excp_helper.c | 2 --
 1 file changed, 2 deletions(-)
target/ppc/excp_helper.c +0 -2
index bc646c67a0..afdb6a8912 100644
@@ -1155,7 +1155,6 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn)
         (env->spr[SPR_PSSCR] & PSSCR_EC);
 }
 #endif /* defined(TARGET_PPC64) */
-#endif /* CONFIG_TCG */
 
 static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)
 {
@@ -1188,7 +1187,6 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)
     check_tlb_flush(env, false);
 }
 
-#ifdef CONFIG_TCG
 void helper_rfi(CPUPPCState *env)
 {
     do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1] & 0xfffffffful);
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Fabiano Rosas
Quoted 5 lines · Fabiano Rosas

The --disable-tcg build broke when do_rfi stopped being inlined.

Fixes 62e79ef914 ("target/ppc: Remove static inline")

---

Quoted 23 lines
  target/ppc/excp_helper.c | 2 --
  1 file changed, 2 deletions(-)
target/ppc/excp_helper.c +0 -2
index bc646c67a0..afdb6a8912 100644
@@ -1155,7 +1155,6 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn)
          (env->spr[SPR_PSSCR] & PSSCR_EC);
  }
  #endif /* defined(TARGET_PPC64) */
-#endif /* CONFIG_TCG */
 
  static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)
  {
@@ -1188,7 +1187,6 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)
      check_tlb_flush(env, false);
  }
 
-#ifdef CONFIG_TCG
  void helper_rfi(CPUPPCState *env)
  {
      do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1] & 0xfffffffful);