On Thu, Feb 28, 2019 at 07:57:55PM -0300, Fabiano Rosas wrote:
> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
This is a nice cleanup, regardless of the rest of the series. Applied
to ppc-for-4.0.
> ---
> target/ppc/excp_helper.c | 30 +++++++++++++++++++-----------
> 1 file changed, 19 insertions(+), 11 deletions(-)
>
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 39bedbb11d..beafcf1ebd 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -107,6 +107,24 @@ static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp,
> return POWERPC_EXCP_RESET;
> }
>
> +static uint64_t ppc_excp_vector_offset(CPUState *cs, int ail)
> +{
> + uint64_t offset = 0;
> +
> + switch (ail) {
> + case AIL_0001_8000:
> + offset = 0x18000;
> + break;
> + case AIL_C000_0000_0000_4000:
> + offset = 0xc000000000004000ull;
> + break;
> + default:
> + cpu_abort(cs, "Invalid AIL combination %d\n", ail);
> + break;
> + }
> +
> + return offset;
> +}
>
> /* Note that this function should be greatly optimized
> * when called with a constant excp, from ppc_hw_interrupt
> @@ -708,17 +726,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp)
> /* Handle AIL */
> if (ail) {
> new_msr |= (1 << MSR_IR) | (1 << MSR_DR);
> - switch(ail) {
> - case AIL_0001_8000:
> - vector |= 0x18000;
> - break;
> - case AIL_C000_0000_0000_4000:
> - vector |= 0xc000000000004000ull;
> - break;
> - default:
> - cpu_abort(cs, "Invalid AIL combination %d\n", ail);
> - break;
> - }
> + vector |= ppc_excp_vector_offset(cs, ail);
> }
>
> #if defined(TARGET_PPC64)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson