summary refs log tree commit diff stats
path: root/target-lm32/cpu.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-09-11 18:01:56 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-09-11 18:01:56 +0100
commit8f6e82e4ecec9bc2726725275a138bc30f3ffc81 (patch)
treeb4407948b8bd54589c0b130512f39441a86952bb /target-lm32/cpu.h
parent30c38c90bd3f1bb105ebc069ac1821067c980b7c (diff)
parent1c3c8af1fb40a481c07749e0448644d9b7700415 (diff)
downloadfocaccia-qemu-8f6e82e4ecec9bc2726725275a138bc30f3ffc81.tar.gz
focaccia-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-lm32/cpu.h')
-rw-r--r--target-lm32/cpu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
index 944777d052..cc7726301e 100644
--- a/target-lm32/cpu.h
+++ b/target-lm32/cpu.h
@@ -34,7 +34,7 @@ typedef struct CPULM32State CPULM32State;
 
 #define NB_MMU_MODES 1
 #define TARGET_PAGE_BITS 12
-static inline int cpu_mmu_index(CPULM32State *env)
+static inline int cpu_mmu_index(CPULM32State *env, bool ifetch)
 {
     return 0;
 }