path: root/target-unicore32
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-unicore32
parentbcd4f22796ebda2934a980060ea704ebedb46173 (diff)
parentf8121c4b11bcea1d5e52b9510b5ebf6be5e7e9b3 (diff)
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-unicore32') (more/less context) (ignore whitespace changes)
5 files changed, 7 insertions, 10 deletions
diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h
index 1e10049..9817607 100644
--- a/target-unicore32/cpu.h
+++ b/target-unicore32/cpu.h
@@ -179,4 +179,10 @@ void uc32_translate_init(void);
void do_interrupt(CPUState *);
void switch_mode(CPUState_UniCore32 *, int);
+static inline bool cpu_has_work(CPUState *env)
+ return env->interrupt_request &
#endif /* __CPU_UC32_H__ */
diff --git a/target-unicore32/exec.h b/target-unicore32/exec.h
index 4ab55f4..7912105 100644
--- a/target-unicore32/exec.h
+++ b/target-unicore32/exec.h
@@ -16,7 +16,6 @@
register struct CPUState_UniCore32 *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
static inline void env_to_regs(void)
@@ -26,12 +25,6 @@ static inline void regs_to_env(void)
-static inline int cpu_has_work(CPUState *env)
- return env->interrupt_request &
static inline int cpu_halted(CPUState *env)
if (!env->halted) {
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index 483aeae..02707d5 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -10,7 +10,6 @@
#include <string.h>
#include "cpu.h"
-#include "exec-all.h"
#include "gdbstub.h"
#include "helper.h"
#include "qemu-common.h"
diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c
index 31e4b11..541e6f0 100644
--- a/target-unicore32/op_helper.c
+++ b/target-unicore32/op_helper.c
@@ -16,7 +16,7 @@
void HELPER(exception)(uint32_t excp)
env->exception_index = excp;
- cpu_loop_exit();
+ cpu_loop_exit(env);
static target_ulong asr_read(void)
diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index 98eaeb3..a15e42d 100644
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -14,7 +14,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-log.h"