diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-23 18:26:58 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-23 18:26:58 +0100 |
| commit | 7ba48975d342ef4d9251097f24be0db328f36f7d (patch) | |
| tree | 08b67d12fe2ea9fea0dea3ce05827e66a7d25a29 /include/exec/exec-all.h | |
| parent | 9f862687eaf7335deb8955e1c25e1d36b9b3c90c (diff) | |
| parent | a84ac4cbbb4f4705305189ef007a8432b0b9f718 (diff) | |
| download | focaccia-qemu-7ba48975d342ef4d9251097f24be0db328f36f7d.tar.gz focaccia-qemu-7ba48975d342ef4d9251097f24be0db328f36f7d.zip | |
Merge remote-tracking branch 'remotes/rth/tcg-ppc-merge-1' into staging
* remotes/rth/tcg-ppc-merge-1: (25 commits) tcg-ppc: Use the return address as a base pointer tcg-ppc: Merge cache-utils into the backend qemu/osdep: Remove the need for qemu_init_auxval tcg-ppc: Rename the tcg/ppc64 backend tcg-ppc: Remove the backend tcg-ppc64: Merge ppc32 shifts tcg-ppc64: Support mulsh_i32 tcg-ppc64: Merge ppc32 register usage tcg-ppc64: Merge ppc32 qemu_ld/st tcg-ppc64: Merge ppc32 brcond2, setcond2, muluh tcg-ppc64: Begin merging ppc32 with ppc64 tcg-ppc64: Fix sub2 implementation tcg-ppc64: Merge 32-bit ABIs into the prologue / frame code tcg-ppc64: Adjust tcg_out_call for ELFv2 tcg-ppc64: Support the ppc64 elfv2 ABI tcg-ppc64: Use the correct test in tcg_out_call tcg-ppc64: Better parameterize the stack frame tcg-ppc64: Fix TCG_TARGET_CALL_STACK_OFFSET tcg-ppc64: Move call macros out of tcg-target.h tcg-ppc64: Make TCG_AREG0 and TCG_REG_CALL_STACK enum constants ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/exec-all.h')
| -rw-r--r-- | include/exec/exec-all.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 3d62d9c464..5e5d86ec46 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -224,7 +224,7 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) /* no need to flush icache explicitly */ } #elif defined(_ARCH_PPC) -void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr); +void ppc_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr); #define tb_set_jmp_target1 ppc_tb_set_jmp_target #elif defined(__i386__) || defined(__x86_64__) static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) |