Commit dac03af5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20190825' into staging 



Fix for alpha_cpu_tlb_fill

# gpg: Signature made Sun 25 Aug 2019 20:35:22 BST
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-axp-20190825:
  target/alpha: fix tlb_fill trap_arg2 value for instruction fetch

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5428e12d cb1de55a

target/alpha/helper.c

+3 −1
Original line number Diff line number Diff line
@@ -283,7 +283,9 @@ bool alpha_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, 
        cs->exception_index = EXCP_MMFAULT;

        env->trap_arg0 = addr;

        env->trap_arg1 = fail;

        env->trap_arg2 = (access_type == MMU_INST_FETCH ? -1 : access_type);

        env->trap_arg2 = (access_type == MMU_DATA_LOAD ? 0ull :

                          access_type == MMU_DATA_STORE ? 1ull :

                          /* access_type == MMU_INST_FETCH */ -1ull);

        cpu_loop_exit_restore(cs, retaddr);

    }