diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-11 18:01:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-11 18:01:56 +0100 |
| commit | 8f6e82e4ecec9bc2726725275a138bc30f3ffc81 (patch) | |
| tree | b4407948b8bd54589c0b130512f39441a86952bb /target-sh4 | |
| parent | 30c38c90bd3f1bb105ebc069ac1821067c980b7c (diff) | |
| parent | 1c3c8af1fb40a481c07749e0448644d9b7700415 (diff) | |
| download | qemu-8f6e82e4ecec9bc2726725275a138bc30f3ffc81.tar.gz | |
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-sh4')
| -rw-r--r-- | target-sh4/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index 34bb3d7799..1f68b27a90 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -235,7 +235,7 @@ void cpu_load_tlb(CPUSH4State * env); #define MMU_MODE0_SUFFIX _kernel #define MMU_MODE1_SUFFIX _user #define MMU_USER_IDX 1 -static inline int cpu_mmu_index (CPUSH4State *env) +static inline int cpu_mmu_index (CPUSH4State *env, bool ifetch) { return (env->sr & (1u << SR_MD)) == 0 ? 1 : 0; } |