openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for alpha_cpu_tlb_fill 

-----BEGIN PGP SIGNATURE-----
 
 iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAl1i4vodHHJpY2hhcmQu
 aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV9SAwgAhbmeDlCkvoZqfQ7x
 m6Xzr/vkD67zPQP4vBYdI5P8zJTOF7U/GTtzul22yCgplohsmb/MkiSIarra0Iax
 K3exnPICOxnP4CFf3Unu1C29g7IkPbinAE/laq3bpE3C/IpsU+FrQC5vBECcmX7m
 cdlPd+LlLwoszviBmqwOUZYy7joIl0DqjP5zLrDy+V8RyZb+WFwLow8bomGN3KET
 i4xG1sr9lcaAMgAotF7CdTWFmq16TLQ+hyF6YGcjkmYFGgLgqAgNTvFeNibBN01g
 Vyrdj2NDT+516jXCaN/3CjOESAlFLRAEaas1fESuKRDSxYvots+0HIrXtE7+mGho
 d+MD4g==
 =7saY
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2019-08-27 10:00:51 +01:00
parent 5428e12d52 cb1de55a83
commit dac03af5d5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/alpha/helper.c
View File

@ -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);
}