| Message ID | 20250127102620.39159-10-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/ppc: Move TCG code from excp_helper.c to tcg-excp_helper.c | expand |
On 1/27/25 15:56, Philippe Mathieu-Daudé wrote: > Move exception helpers to tcg-excp_helper.c so they are > only built when TCG is selected. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/ppc/excp_helper.c | 34 -------------------------------- > target/ppc/tcg-excp_helper.c | 38 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 38 insertions(+), 34 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 9e1a2ecc36f..6a12402b23a 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -2504,41 +2504,7 @@ bool ppc_cpu_exec_interrupt(CPUState *cs, int interrupt_request) > > #endif /* !CONFIG_USER_ONLY */ > > -/*****************************************************************************/ > -/* Exceptions processing helpers */ > - > -void raise_exception_err_ra(CPUPPCState *env, uint32_t exception, > - uint32_t error_code, uintptr_t raddr) > -{ > - CPUState *cs = env_cpu(env); > - > - cs->exception_index = exception; > - env->error_code = error_code; > - cpu_loop_exit_restore(cs, raddr); > -} > - > -void raise_exception_err(CPUPPCState *env, uint32_t exception, > - uint32_t error_code) > -{ > - raise_exception_err_ra(env, exception, error_code, 0); > -} > - > -void raise_exception(CPUPPCState *env, uint32_t exception) > -{ > - raise_exception_err_ra(env, exception, 0, 0); > -} > - > #ifdef CONFIG_TCG > -void helper_raise_exception_err(CPUPPCState *env, uint32_t exception, > - uint32_t error_code) > -{ > - raise_exception_err_ra(env, exception, error_code, 0); > -} > - > -void helper_raise_exception(CPUPPCState *env, uint32_t exception) > -{ > - raise_exception_err_ra(env, exception, 0, 0); > -} > > #ifndef CONFIG_USER_ONLY > void helper_store_msr(CPUPPCState *env, target_ulong val) > diff --git a/target/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c > index 93c2d6b5a03..268a1614597 100644 > --- a/target/ppc/tcg-excp_helper.c > +++ b/target/ppc/tcg-excp_helper.c > @@ -19,15 +19,53 @@ > #include "qemu/osdep.h" > #include "qemu/log.h" > #include "exec/cpu_ldst.h" > +#include "exec/exec-all.h" > +#include "exec/helper-proto.h" > #include "system/runstate.h" > > +#include "helper_regs.h" > #include "hw/ppc/ppc.h" > #include "internal.h" > #include "cpu.h" > #include "trace.h" > > +/*****************************************************************************/ > +/* Exceptions processing helpers */ > + > +void raise_exception_err_ra(CPUPPCState *env, uint32_t exception, > + uint32_t error_code, uintptr_t raddr) > +{ > + CPUState *cs = env_cpu(env); > + > + cs->exception_index = exception; > + env->error_code = error_code; > + cpu_loop_exit_restore(cs, raddr); > +} > + > +void helper_raise_exception_err(CPUPPCState *env, uint32_t exception, > + uint32_t error_code) > +{ > + raise_exception_err_ra(env, exception, error_code, 0); > +} > + > +void helper_raise_exception(CPUPPCState *env, uint32_t exception) > +{ > + raise_exception_err_ra(env, exception, 0, 0); > +} > + > #ifndef CONFIG_USER_ONLY > In excp_helper.c, below helpers were getting built when CONFIG_USER_ONLY is defined. Is this change to move under above ifndef intentional? regards, Harsh > +void raise_exception_err(CPUPPCState *env, uint32_t exception, > + uint32_t error_code) > +{ > + raise_exception_err_ra(env, exception, error_code, 0); > +} > + > +void raise_exception(CPUPPCState *env, uint32_t exception) > +{ > + raise_exception_err_ra(env, exception, 0, 0); > +} > + > void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, > MMUAccessType access_type, > int mmu_idx, uintptr_t retaddr)
On 28/1/25 10:59, Harsh Prateek Bora wrote: > > > On 1/27/25 15:56, Philippe Mathieu-Daudé wrote: >> Move exception helpers to tcg-excp_helper.c so they are >> only built when TCG is selected. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> target/ppc/excp_helper.c | 34 -------------------------------- >> target/ppc/tcg-excp_helper.c | 38 ++++++++++++++++++++++++++++++++++++ >> 2 files changed, 38 insertions(+), 34 deletions(-) >> >> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c >> index 9e1a2ecc36f..6a12402b23a 100644 >> --- a/target/ppc/excp_helper.c >> +++ b/target/ppc/excp_helper.c >> @@ -2504,41 +2504,7 @@ bool ppc_cpu_exec_interrupt(CPUState *cs, int >> interrupt_request) >> #endif /* !CONFIG_USER_ONLY */ >> -/ >> *****************************************************************************/ >> -/* Exceptions processing helpers */ >> - >> -void raise_exception_err_ra(CPUPPCState *env, uint32_t exception, >> - uint32_t error_code, uintptr_t raddr) >> -{ >> - CPUState *cs = env_cpu(env); >> - >> - cs->exception_index = exception; >> - env->error_code = error_code; >> - cpu_loop_exit_restore(cs, raddr); >> -} >> - >> -void raise_exception_err(CPUPPCState *env, uint32_t exception, >> - uint32_t error_code) >> -{ >> - raise_exception_err_ra(env, exception, error_code, 0); >> -} >> - >> -void raise_exception(CPUPPCState *env, uint32_t exception) >> -{ >> - raise_exception_err_ra(env, exception, 0, 0); >> -} >> - >> #ifdef CONFIG_TCG >> -void helper_raise_exception_err(CPUPPCState *env, uint32_t exception, >> - uint32_t error_code) >> -{ >> - raise_exception_err_ra(env, exception, error_code, 0); >> -} >> - >> -void helper_raise_exception(CPUPPCState *env, uint32_t exception) >> -{ >> - raise_exception_err_ra(env, exception, 0, 0); >> -} >> #ifndef CONFIG_USER_ONLY >> void helper_store_msr(CPUPPCState *env, target_ulong val) >> diff --git a/target/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c >> index 93c2d6b5a03..268a1614597 100644 >> --- a/target/ppc/tcg-excp_helper.c >> +++ b/target/ppc/tcg-excp_helper.c >> @@ -19,15 +19,53 @@ >> #include "qemu/osdep.h" >> #include "qemu/log.h" >> #include "exec/cpu_ldst.h" >> +#include "exec/exec-all.h" >> +#include "exec/helper-proto.h" >> #include "system/runstate.h" >> +#include "helper_regs.h" >> #include "hw/ppc/ppc.h" >> #include "internal.h" >> #include "cpu.h" >> #include "trace.h" >> +/ >> *****************************************************************************/ >> +/* Exceptions processing helpers */ >> + >> +void raise_exception_err_ra(CPUPPCState *env, uint32_t exception, >> + uint32_t error_code, uintptr_t raddr) >> +{ >> + CPUState *cs = env_cpu(env); >> + >> + cs->exception_index = exception; >> + env->error_code = error_code; >> + cpu_loop_exit_restore(cs, raddr); >> +} >> + >> +void helper_raise_exception_err(CPUPPCState *env, uint32_t exception, >> + uint32_t error_code) >> +{ >> + raise_exception_err_ra(env, exception, error_code, 0); >> +} >> + >> +void helper_raise_exception(CPUPPCState *env, uint32_t exception) >> +{ >> + raise_exception_err_ra(env, exception, 0, 0); >> +} >> + >> #ifndef CONFIG_USER_ONLY > > In excp_helper.c, below helpers were getting built when CONFIG_USER_ONLY > is defined. Is this change to move under above ifndef intentional? Yes, they are unused otherwise. I'll mention in commit description. > > regards, > Harsh
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 9e1a2ecc36f..6a12402b23a 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2504,41 +2504,7 @@ bool ppc_cpu_exec_interrupt(CPUState *cs, int interrupt_request) #endif /* !CONFIG_USER_ONLY */ -/*****************************************************************************/ -/* Exceptions processing helpers */ - -void raise_exception_err_ra(CPUPPCState *env, uint32_t exception, - uint32_t error_code, uintptr_t raddr) -{ - CPUState *cs = env_cpu(env); - - cs->exception_index = exception; - env->error_code = error_code; - cpu_loop_exit_restore(cs, raddr); -} - -void raise_exception_err(CPUPPCState *env, uint32_t exception, - uint32_t error_code) -{ - raise_exception_err_ra(env, exception, error_code, 0); -} - -void raise_exception(CPUPPCState *env, uint32_t exception) -{ - raise_exception_err_ra(env, exception, 0, 0); -} - #ifdef CONFIG_TCG -void helper_raise_exception_err(CPUPPCState *env, uint32_t exception, - uint32_t error_code) -{ - raise_exception_err_ra(env, exception, error_code, 0); -} - -void helper_raise_exception(CPUPPCState *env, uint32_t exception) -{ - raise_exception_err_ra(env, exception, 0, 0); -} #ifndef CONFIG_USER_ONLY void helper_store_msr(CPUPPCState *env, target_ulong val) diff --git a/target/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c index 93c2d6b5a03..268a1614597 100644 --- a/target/ppc/tcg-excp_helper.c +++ b/target/ppc/tcg-excp_helper.c @@ -19,15 +19,53 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "exec/cpu_ldst.h" +#include "exec/exec-all.h" +#include "exec/helper-proto.h" #include "system/runstate.h" +#include "helper_regs.h" #include "hw/ppc/ppc.h" #include "internal.h" #include "cpu.h" #include "trace.h" +/*****************************************************************************/ +/* Exceptions processing helpers */ + +void raise_exception_err_ra(CPUPPCState *env, uint32_t exception, + uint32_t error_code, uintptr_t raddr) +{ + CPUState *cs = env_cpu(env); + + cs->exception_index = exception; + env->error_code = error_code; + cpu_loop_exit_restore(cs, raddr); +} + +void helper_raise_exception_err(CPUPPCState *env, uint32_t exception, + uint32_t error_code) +{ + raise_exception_err_ra(env, exception, error_code, 0); +} + +void helper_raise_exception(CPUPPCState *env, uint32_t exception) +{ + raise_exception_err_ra(env, exception, 0, 0); +} + #ifndef CONFIG_USER_ONLY +void raise_exception_err(CPUPPCState *env, uint32_t exception, + uint32_t error_code) +{ + raise_exception_err_ra(env, exception, error_code, 0); +} + +void raise_exception(CPUPPCState *env, uint32_t exception) +{ + raise_exception_err_ra(env, exception, 0, 0); +} + void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr)
Move exception helpers to tcg-excp_helper.c so they are only built when TCG is selected. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/ppc/excp_helper.c | 34 -------------------------------- target/ppc/tcg-excp_helper.c | 38 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 34 deletions(-)