diff options
| author | Aurelien Jarno | 2013-09-03 01:35:43 +0200 |
|---|---|---|
| committer | Aurelien Jarno | 2013-09-03 01:35:43 +0200 |
| commit | 545825d4cda03ea292b7788b3401b99860efe8bc (patch) | |
| tree | 22983d4bcd8f48fb38561d241ac5e2d7e51e5a22 /target-xtensa | |
| parent | Merge branch 'ppc-for-upstream' of git://github.com/agraf/qemu (diff) | |
| parent | tcg-i386: Make use of zero-extended memory helper routines (diff) | |
| download | qemu-545825d4cda03ea292b7788b3401b99860efe8bc.tar.gz qemu-545825d4cda03ea292b7788b3401b99860efe8bc.tar.xz qemu-545825d4cda03ea292b7788b3401b99860efe8bc.zip | |
Merge branch 'tcg-next' of git://github.com/rth7680/qemu
* 'tcg-next' of git://github.com/rth7680/qemu: (29 commits)
tcg-i386: Make use of zero-extended memory helper routines
tcg: Introduce zero and sign-extended versions of load helpers
exec: Split softmmu_defs.h
target: Include softmmu_exec.h where forgotten
exec: Rename USUFFIX to LSUFFIX
tcg-i386: Don't perform GETPC adjustment in TCG code
exec: Reorganize the GETRA/GETPC macros
configure: Allow x32 as a host
tcg-i386: Adjust tcg_out_tlb_load for x32
tcg-i386: Use intptr_t appropriately
tcg: Fix jit debug for x32
tcg: Use appropriate types in tcg_reg_alloc_call
tcg: Change tcg_out_ld/st offset to intptr_t
tcg: Change tcg_gen_exit_tb argument to uintptr_t
tcg: Use uintptr_t in TCGHelperInfo
tcg: Change relocation offsets to intptr_t
tcg: Change memory offsets to intptr_t
tcg: Change frame pointer offsets to intptr_t
tcg: Define TCG_ptr properly
tcg: Define TCG_TYPE_PTR properly
...
Diffstat (limited to 'target-xtensa')
| -rw-r--r-- | target-xtensa/op_helper.c | 1 | ||||
| -rw-r--r-- | target-xtensa/translate.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c index 01123af707..cf970257db 100644 --- a/target-xtensa/op_helper.c +++ b/target-xtensa/op_helper.c @@ -28,6 +28,7 @@ #include "cpu.h" #include "helper.h" #include "qemu/host-utils.h" +#include "exec/softmmu_exec.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 504cc539e3..24343bdf60 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -400,7 +400,7 @@ static void gen_jump_slot(DisasContext *dc, TCGv dest, int slot) } else { if (slot >= 0) { tcg_gen_goto_tb(slot); - tcg_gen_exit_tb((tcg_target_long)dc->tb + slot); + tcg_gen_exit_tb((uintptr_t)dc->tb + slot); } else { tcg_gen_exit_tb(0); } |