On 14 October 2015 at 23:55, Edgar E. Iglesias <edgar.igles...@gmail.com> wrote:
> From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com>
>
> Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
> ---
> target-arm/op_helper.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
> index d4715f4..2ccd1c9 100644
> --- a/target-arm/op_helper.c
> +++ b/target-arm/op_helper.c
> @@ -90,13 +90,19 @@ void tlb_fill(CPUState *cs, target_ulong addr, int
> is_write, int mmu_idx,
> ARMCPU *cpu = ARM_CPU(cs);
> CPUARMState *env = &cpu->env;
> uint32_t syn, exc;
> - bool same_el = (arm_current_el(env) != 0);
> + unsigned int target_el;
> + bool same_el;
>
> if (retaddr) {
> /* now we have a real cpu fault */
> cpu_restore_state(cs, retaddr);
> }
>
> + target_el = exception_target_el(env);
> + if (fi.stage2) {
> + target_el = 2;
> + }
> + same_el = arm_current_el(env) == target_el;
> /* AArch64 syndrome does not have an LPAE bit */
> syn = fsr & ~(1 << 9);
>
> @@ -116,7 +122,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, int
> is_write, int mmu_idx,
>
> env->exception.vaddress = addr;
> env->exception.fsr = fsr;
> - raise_exception(env, exc, syn, exception_target_el(env));
> + raise_exception(env, exc, syn, target_el);
> }
> }
Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
thanks
-- PMM
