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 /target-i386/cpu.h | |
| 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 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 74b674d524..151f1b9d7f 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1199,7 +1199,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define MMU_KSMAP_IDX 0 #define MMU_USER_IDX 1 #define MMU_KNOSMAP_IDX 2 -static inline int cpu_mmu_index(CPUX86State *env) +static inline int cpu_mmu_index(CPUX86State *env, bool ifetch) { return (env->hflags & HF_CPL_MASK) == 3 ? MMU_USER_IDX : (!(env->hflags & HF_SMAP_MASK) || (env->eflags & AC_MASK)) |