summaryrefslogtreecommitdiffstats
path: root/target-cris
authorAvi Kivity <[email protected]>2011-06-28 12:11:13 (GMT)
committer Avi Kivity <[email protected]>2011-06-28 12:11:13 (GMT)
commitd58931037dbb4fbc2fbb33858629d3fabfd1b0d4 (patch) (side-by-side diff)
tree5f372ea90abbdc86a30521872b00b46c9e771413 /target-cris
parentbcd4f22796ebda2934a980060ea704ebedb46173 (diff)
parentf8121c4b11bcea1d5e52b9510b5ebf6be5e7e9b3 (diff)
downloadqemu-kvm-master.zip
qemu-kvm-master.tar.gz
qemu-kvm-master.tar.bz2
Merge branch 'upstream-merge' into nextmaster
* upstream-merge: (69 commits) tcg/ppc64: Remove tcg_out_addi tcg/ppc: Remove tcg_out_addi vnc: Fix compilation with --enable-vnc-png virtio-serial: Fix segfault on guest boot Fix MinGW compilation when --enable-vnc-jpeg is specified TCG/Sparc64: use stack for TCG temps TCG/x86: use stack for TCG temps TCG/x86: use TCG_REG_CALL_STACK instead of TCG_REG_ESP TCG: remove broken stack allocation for call arguments TCG: fix negative frame offset calculations Delegate setup of TCG temporaries to targets cpu-exec.c: avoid AREG0 use Remove exec-all.h include directives Move cpu_has_work and cpu_pc_from_tb to cpu.h exec.h: fix coding style and change cpu_has_work to return bool cpu-exec: unify do_interrupt call m68k: use caller supplied CPUState for interrupt related stuff x86: use caller supplied CPUState for interrupt related stuff sparc: move do_interrupt to helper.c sparc: fix coding style of the area to be moved ... Signed-off-by: Avi Kivity <[email protected]>
Diffstat (limited to 'target-cris') (more/less context) (ignore whitespace changes)
-rw-r--r--target-cris/cpu.h11
-rw-r--r--target-cris/exec.h12
-rw-r--r--target-cris/helper.c1
-rw-r--r--target-cris/mmu.c1
-rw-r--r--target-cris/op_helper.c4
-rw-r--r--target-cris/translate.c1
6 files changed, 13 insertions, 17 deletions
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 2bc35e4..ecb0df1 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -268,4 +268,15 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
#define cpu_list cris_cpu_list
void cris_cpu_list(FILE *f, fprintf_function cpu_fprintf);
+static inline bool cpu_has_work(CPUState *env)
+{
+ return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
+}
+
+#include "exec-all.h"
+
+static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
+{
+ env->pc = tb->pc;
+}
#endif
diff --git a/target-cris/exec.h b/target-cris/exec.h
index 2d5d297..3294abe 100644
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -22,19 +22,7 @@
register struct CPUCRISState *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
#if !defined(CONFIG_USER_ONLY)
#include "softmmu_exec.h"
#endif
-
-static inline int cpu_has_work(CPUState *env)
-{
- return (env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI));
-}
-
-static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
-{
- env->pc = tb->pc;
-}
-
diff --git a/target-cris/helper.c b/target-cris/helper.c
index 2a4403b..962d214 100644
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -24,7 +24,6 @@
#include "config.h"
#include "cpu.h"
#include "mmu.h"
-#include "exec-all.h"
#include "host-utils.h"
diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index 1243745..d481e39 100644
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -27,7 +27,6 @@
#include "config.h"
#include "cpu.h"
#include "mmu.h"
-#include "exec-all.h"
#ifdef DEBUG
#define D(x) x
diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index 34329e2..b3ddd33 100644
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -83,7 +83,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
helper_top_evaluate_flags();
}
}
- cpu_loop_exit();
+ cpu_loop_exit(env);
}
env = saved_env;
}
@@ -93,7 +93,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
void helper_raise_exception(uint32_t index)
{
env->exception_index = index;
- cpu_loop_exit();
+ cpu_loop_exit(env);
}
void helper_tlb_flush_pid(uint32_t pid)
diff --git a/target-cris/translate.c b/target-cris/translate.c
index e2607d6..dd85859 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -30,7 +30,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "helper.h"