diff options
author | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:39:34 +0100 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:40:49 +0100 |
commit | 501a7ce7270955be151c442c27620fa7af2f3ce5 (patch) | |
tree | 0374e4d581a0246074d55712b81baf01f3c439b6 /target-xtensa | |
parent | 62e0c095450f6a7eb37914991f3f7966aa4da7a1 (diff) | |
parent | 36f25d2537c40c6c47f4abee5d31a24863d1adf7 (diff) | |
download | hqemu-501a7ce7270955be151c442c27620fa7af2f3ce5.zip hqemu-501a7ce7270955be151c442c27620fa7af2f3ce5.tar.gz |
Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu
Adapt header include paths.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-xtensa')
-rw-r--r-- | target-xtensa/core-dc232b.c | 6 | ||||
-rw-r--r-- | target-xtensa/core-dc233c.c | 6 | ||||
-rw-r--r-- | target-xtensa/core-fsf.c | 6 | ||||
-rw-r--r-- | target-xtensa/cpu-qom.h | 2 | ||||
-rw-r--r-- | target-xtensa/cpu.h | 6 | ||||
-rw-r--r-- | target-xtensa/helper.c | 6 | ||||
-rw-r--r-- | target-xtensa/helper.h | 4 | ||||
-rw-r--r-- | target-xtensa/op_helper.c | 10 | ||||
-rw-r--r-- | target-xtensa/translate.c | 16 | ||||
-rw-r--r-- | target-xtensa/xtensa-semi.c | 2 |
10 files changed, 34 insertions, 30 deletions
diff --git a/target-xtensa/core-dc232b.c b/target-xtensa/core-dc232b.c index 804fdef..0bfcf24 100644 --- a/target-xtensa/core-dc232b.c +++ b/target-xtensa/core-dc232b.c @@ -26,9 +26,9 @@ */ #include "cpu.h" -#include "exec-all.h" -#include "gdbstub.h" -#include "host-utils.h" +#include "exec/exec-all.h" +#include "exec/gdbstub.h" +#include "qemu/host-utils.h" #include "core-dc232b/core-isa.h" #include "overlay_tool.h" diff --git a/target-xtensa/core-dc233c.c b/target-xtensa/core-dc233c.c index d643f41..11acbf3 100644 --- a/target-xtensa/core-dc233c.c +++ b/target-xtensa/core-dc233c.c @@ -26,10 +26,10 @@ */ #include "cpu.h" -#include "exec-all.h" -#include "gdbstub.h" +#include "exec/exec-all.h" +#include "exec/gdbstub.h" #include "qemu-common.h" -#include "host-utils.h" +#include "qemu/host-utils.h" #include "core-dc233c/core-isa.h" #include "overlay_tool.h" diff --git a/target-xtensa/core-fsf.c b/target-xtensa/core-fsf.c index e36b0de..d4660ed 100644 --- a/target-xtensa/core-fsf.c +++ b/target-xtensa/core-fsf.c @@ -26,9 +26,9 @@ */ #include "cpu.h" -#include "exec-all.h" -#include "gdbstub.h" -#include "host-utils.h" +#include "exec/exec-all.h" +#include "exec/gdbstub.h" +#include "qemu/host-utils.h" #include "core-fsf/core-isa.h" #include "overlay_tool.h" diff --git a/target-xtensa/cpu-qom.h b/target-xtensa/cpu-qom.h index 1fd2f27..e344a9a 100644 --- a/target-xtensa/cpu-qom.h +++ b/target-xtensa/cpu-qom.h @@ -29,7 +29,7 @@ #ifndef QEMU_XTENSA_CPU_QOM_H #define QEMU_XTENSA_CPU_QOM_H -#include "qemu/cpu.h" +#include "qom/cpu.h" #include "cpu.h" #define TYPE_XTENSA_CPU "xtensa-cpu" diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h index 08fd5bc..5acf78c 100644 --- a/target-xtensa/cpu.h +++ b/target-xtensa/cpu.h @@ -35,7 +35,7 @@ #include "config.h" #include "qemu-common.h" -#include "cpu-defs.h" +#include "exec/cpu-defs.h" #include "fpu/softfloat.h" #define TARGET_HAS_ICE 1 @@ -512,8 +512,8 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc, } } -#include "cpu-all.h" -#include "exec-all.h" +#include "exec/cpu-all.h" +#include "exec/exec-all.h" static inline int cpu_has_work(CPUState *cpu) { diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index bf05575..94c03a1 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -26,9 +26,9 @@ */ #include "cpu.h" -#include "exec-all.h" -#include "gdbstub.h" -#include "host-utils.h" +#include "exec/exec-all.h" +#include "exec/gdbstub.h" +#include "qemu/host-utils.h" #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" #endif diff --git a/target-xtensa/helper.h b/target-xtensa/helper.h index 5b4cd27..38d7157 100644 --- a/target-xtensa/helper.h +++ b/target-xtensa/helper.h @@ -1,4 +1,4 @@ -#include "def-helper.h" +#include "exec/def-helper.h" DEF_HELPER_2(exception, noreturn, env, i32) DEF_HELPER_3(exception_cause, noreturn, env, i32, i32) @@ -58,4 +58,4 @@ DEF_HELPER_4(ult_s, void, env, i32, f32, f32) DEF_HELPER_4(ole_s, void, env, i32, f32, f32) DEF_HELPER_4(ule_s, void, env, i32, f32, f32) -#include "def-helper.h" +#include "exec/def-helper.h" diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c index 84f0449..3813a72 100644 --- a/target-xtensa/op_helper.c +++ b/target-xtensa/op_helper.c @@ -27,7 +27,7 @@ #include "cpu.h" #include "helper.h" -#include "host-utils.h" +#include "qemu/host-utils.h" static void do_unaligned_access(CPUXtensaState *env, target_ulong addr, int is_write, int is_user, uintptr_t retaddr); @@ -36,16 +36,16 @@ static void do_unaligned_access(CPUXtensaState *env, #define MMUSUFFIX _mmu #define SHIFT 0 -#include "softmmu_template.h" +#include "exec/softmmu_template.h" #define SHIFT 1 -#include "softmmu_template.h" +#include "exec/softmmu_template.h" #define SHIFT 2 -#include "softmmu_template.h" +#include "exec/softmmu_template.h" #define SHIFT 3 -#include "softmmu_template.h" +#include "exec/softmmu_template.h" static void do_unaligned_access(CPUXtensaState *env, target_ulong addr, int is_write, int is_user, uintptr_t retaddr) diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 5d8762c..7029ac4 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -31,11 +31,11 @@ #include <stdio.h> #include "cpu.h" -#include "exec-all.h" -#include "disas.h" +#include "exec/exec-all.h" +#include "disas/disas.h" #include "tcg-op.h" -#include "qemu-log.h" -#include "sysemu.h" +#include "qemu/log.h" +#include "sysemu/sysemu.h" #include "helper.h" #define GEN_HELPER 1 @@ -76,7 +76,7 @@ static TCGv_i32 cpu_FR[16]; static TCGv_i32 cpu_SR[256]; static TCGv_i32 cpu_UR[256]; -#include "gen-icount.h" +#include "exec/gen-icount.h" typedef struct XtensaReg { const char *name; @@ -3005,7 +3005,11 @@ static void gen_intermediate_code_internal( gen_icount_end(tb, insn_count); *tcg_ctx.gen_opc_ptr = INDEX_op_end; - if (!search_pc) { + if (search_pc) { + j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; + memset(tcg_ctx.gen_opc_instr_start + lj + 1, 0, + (j - lj) * sizeof(tcg_ctx.gen_opc_instr_start[0])); + } else { tb->size = dc.pc - pc_start; tb->icount = insn_count; } diff --git a/target-xtensa/xtensa-semi.c b/target-xtensa/xtensa-semi.c index 851ff54..5fe0361 100644 --- a/target-xtensa/xtensa-semi.c +++ b/target-xtensa/xtensa-semi.c @@ -31,7 +31,7 @@ #include <stddef.h> #include "cpu.h" #include "helper.h" -#include "qemu-log.h" +#include "qemu/log.h" enum { TARGET_SYS_exit = 1, |