diff options
| author | Peter Maydell | 2015-09-11 19:01:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-09-11 19:01:56 +0200 |
| commit | 8f6e82e4ecec9bc2726725275a138bc30f3ffc81 (patch) | |
| tree | b4407948b8bd54589c0b130512f39441a86952bb /cputlb.c | |
| parent | scripts/qemu-gdb: Add brief comment describing usage (diff) | |
| parent | cpu-exec: introduce loop exit with restore function (diff) | |
| download | qemu-8f6e82e4ecec9bc2726725275a138bc30f3ffc81.tar.gz qemu-8f6e82e4ecec9bc2726725275a138bc30f3ffc81.tar.xz qemu-8f6e82e4ecec9bc2726725275a138bc30f3ffc81.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150911' into staging
queued tcg related patches
# gpg: Signature made Fri 11 Sep 2015 16:17:00 BST using RSA key ID 4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
* remotes/rth/tags/pull-tcg-20150911:
cpu-exec: introduce loop exit with restore function
softmmu: remove now unused functions
softmmu: add helper function to pass through retaddr
tlb: Add "ifetch" argument to cpu_mmu_index()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'cputlb.c')
| -rw-r--r-- | cputlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -452,7 +452,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) CPUState *cpu = ENV_GET_CPU(env1); page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); - mmu_idx = cpu_mmu_index(env1); + mmu_idx = cpu_mmu_index(env1, true); if (unlikely(env1->tlb_table[mmu_idx][page_index].addr_code != (addr & TARGET_PAGE_MASK))) { cpu_ldub_code(env1, addr); |