Message ID | 20220124191547.1008391-1-farosas@linux.ibm.com |
---|---|
State | New |
Headers | show |
Series | target/ppc: Put do_rfi under a TCG-only block | expand |
On 1/24/22 16:15, Fabiano Rosas wrote: > The --disable-tcg build broke when do_rfi stopped being inlined. > > Fixes: 62e79ef914 ("target/ppc: Remove static inline") > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> > --- Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> > target/ppc/excp_helper.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index bc646c67a0..afdb6a8912 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -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);
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index bc646c67a0..afdb6a8912 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -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);
The --disable-tcg build broke when do_rfi stopped being inlined. Fixes: 62e79ef914 ("target/ppc: Remove static inline") Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> --- target/ppc/excp_helper.c | 2 -- 1 file changed, 2 deletions(-)