diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-27 10:00:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-27 10:00:51 +0100 |
| commit | dac03af5d5482ec7ee9c23db467bb7230b33c0d9 (patch) | |
| tree | 6a0691999f8572f20641c6d49ae147742c96deef | |
| parent | 5428e12d528fcbe31e8a9b236d1359ad52066382 (diff) | |
| parent | cb1de55a83eaca9ee32be9c959dca99e11f2fea8 (diff) | |
| download | qemu-dac03af5d5482ec7ee9c23db467bb7230b33c0d9.zip qemu-dac03af5d5482ec7ee9c23db467bb7230b33c0d9.tar.gz qemu-dac03af5d5482ec7ee9c23db467bb7230b33c0d9.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/alpha/helper.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/target/alpha/helper.c b/target/alpha/helper.c index c699834..19cda0a 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -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); } |