On 19/01/2019 01:07, Fabiano Rosas wrote:
> Signed-off-by: Fabiano Rosas <faro...@linux.ibm.com>
> ---
> target/ppc/excp_helper.c | 31 ++++++++++++++++++++-----------
> 1 file changed, 20 insertions(+), 11 deletions(-)
>
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 0ec7ae1ad4..337a3ef8bb 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -65,6 +65,25 @@ static inline void dump_syscall(CPUPPCState *env)
> ppc_dump_gpr(env, 6), env->nip);
> }
>
> +static uint64_t ppc_excp_vector_offset(CPUState *cs, int ail)
> +{
> + uint64_t offset;
nit: uninitialized variable. It should not matter though as cpu_abort()
has __attribute__ ((__noreturn__)) but still inaccurate imho.
Other than that
Reviewed-by: Alexey Kardashevskiy <a...@ozlabs.ru>
> +
> + 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
> */
> @@ -685,17 +704,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)
>
--
Alexey
