Aurelien has now reviewed three tcg related patch sets. This is a pull request for all of them, fixing a trivial patch conflict in the process.
r~ The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07: Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500) are available in the git repository at: git://github.com/rth7680/qemu.git tcg-next for you to fetch changes up to 6fb5874590589585cdcad4ca2431d9d8d4d491b1: tcg-i386: Make use of zero-extended memory helper routines (2013-09-02 09:08:31 -0700) ---------------------------------------------------------------- Richard Henderson (29): tcg: Add muluh and mulsh opcodes tcg-mips: Implement mulsh, muluh tcg-ppc64: Implement muluh, mulsh tcg: Constant fold div, rem qtest: Fix FMT_timeval vs time_t tcg: Change flush_icache_range arguments to uintptr_t tcg: Change tcg_qemu_tb_exec return to uintptr_t tcg: Fix next_tb type in cpu_exec tcg: Allow TCG_TARGET_REG_BITS to be specified independantly tcg: Define TCG_TYPE_PTR properly tcg: Define TCG_ptr properly tcg: Change frame pointer offsets to intptr_t tcg: Change memory offsets to intptr_t tcg: Change relocation offsets to intptr_t tcg: Use uintptr_t in TCGHelperInfo tcg: Change tcg_gen_exit_tb argument to uintptr_t tcg: Change tcg_out_ld/st offset to intptr_t tcg: Use appropriate types in tcg_reg_alloc_call tcg: Fix jit debug for x32 tcg-i386: Use intptr_t appropriately tcg-i386: Adjust tcg_out_tlb_load for x32 configure: Allow x32 as a host exec: Reorganize the GETRA/GETPC macros tcg-i386: Don't perform GETPC adjustment in TCG code exec: Rename USUFFIX to LSUFFIX target: Include softmmu_exec.h where forgotten exec: Split softmmu_defs.h tcg: Introduce zero and sign-extended versions of load helpers tcg-i386: Make use of zero-extended memory helper routines configure | 27 +++++--- cpu-exec.c | 4 +- include/exec/exec-all.h | 89 ++++++++++++------------- include/exec/gen-icount.h | 4 +- include/exec/softmmu_defs.h | 49 -------------- include/exec/softmmu_exec.h | 3 +- include/exec/softmmu_template.h | 88 ++++++++++++++++++------- qtest.c | 8 +-- target-alpha/translate.c | 8 +-- target-arm/translate.c | 2 +- target-cris/translate.c | 2 +- target-i386/translate.c | 2 +- target-lm32/op_helper.c | 2 + target-lm32/translate.c | 2 +- target-m68k/translate.c | 2 +- target-microblaze/translate.c | 2 +- target-mips/translate.c | 2 +- target-moxie/helper.c | 1 + target-moxie/translate.c | 2 +- target-openrisc/translate.c | 2 +- target-ppc/mmu_helper.c | 2 + target-ppc/translate.c | 2 +- target-s390x/translate.c | 8 +-- target-sh4/translate.c | 2 +- target-sparc/translate.c | 2 +- target-unicore32/op_helper.c | 2 + target-unicore32/translate.c | 2 +- target-xtensa/op_helper.c | 1 + target-xtensa/translate.c | 2 +- tcg/aarch64/tcg-target.c | 8 +-- tcg/aarch64/tcg-target.h | 7 +- tcg/arm/tcg-target.c | 14 ++-- tcg/arm/tcg-target.h | 11 ++-- tcg/hppa/tcg-target.c | 16 +++-- tcg/hppa/tcg-target.h | 9 +-- tcg/i386/tcg-target.c | 141 ++++++++++++++++++++-------------------- tcg/i386/tcg-target.h | 17 +++-- tcg/ia64/tcg-target.c | 21 +++--- tcg/ia64/tcg-target.h | 7 +- tcg/mips/tcg-target.c | 33 ++++++---- tcg/mips/tcg-target.h | 5 +- tcg/optimize.c | 43 ++++++++++++ tcg/ppc/tcg-target.c | 12 ++-- tcg/ppc/tcg-target.h | 4 +- tcg/ppc64/tcg-target.c | 45 ++++--------- tcg/ppc64/tcg-target.h | 8 ++- tcg/s390/tcg-target.c | 13 ++-- tcg/s390/tcg-target.h | 7 +- tcg/sparc/tcg-target.c | 12 ++-- tcg/sparc/tcg-target.h | 24 ++++--- tcg/tcg-op.h | 42 ++++++++++-- tcg/tcg-opc.h | 4 ++ tcg/tcg.c | 96 ++++++++++++++++----------- tcg/tcg.h | 114 +++++++++++++++++++++++--------- tcg/tci/tcg-target.c | 6 +- tcg/tci/tcg-target.h | 18 +++-- tci.c | 4 +- 57 files changed, 619 insertions(+), 446 deletions(-) delete mode 100644 include/exec/softmmu_defs.h