On Mon, 19 Mar 2012, Stefan Weil wrote: > The previous commit changed function tb_set_jmp_target1 and is needed > for w64 hosts. > > This patch is not needed for w64, but it synchronizes tb_set_jmp_target1 > and ppc_tb_set_jmp_target so that both functions have the same signature. > > Cc: malc <av1...@comtv.ru> > Signed-off-by: Stefan Weil <s...@weilnetz.de> > --- > exec-all.h | 2 +- > tcg/ppc/tcg-target.c | 2 +- > tcg/ppc64/tcg-target.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/exec-all.h b/exec-all.h > index a6d6519..9ffd778 100644 > --- a/exec-all.h > +++ b/exec-all.h > @@ -199,7 +199,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) > diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c > index b0aa914..57000e5 100644 > --- a/tcg/ppc/tcg-target.c > +++ b/tcg/ppc/tcg-target.c > @@ -1305,7 +1305,7 @@ static void tcg_out_brcond2 (TCGContext *s, const > TCGArg *args, > tcg_out_bc (s, (BC | BI (7, CR_EQ) | BO_COND_TRUE), args[5]); > } > > -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) > { > uint32_t *ptr; > long disp = addr - jmp_addr;
This should become intptr_t then.. That said ppc32 code assumes 32bit addresses, and ppc64 tcg_taget_long wide ones.. IOW needs some thinking. > diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c > index 409a1ac..c286322 100644 > --- a/tcg/ppc64/tcg-target.c > +++ b/tcg/ppc64/tcg-target.c > @@ -1233,7 +1233,7 @@ static void tcg_out_brcond (TCGContext *s, TCGCond cond, > tcg_out_bc (s, tcg_to_bc[cond], label_index); > } > > -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) > { > TCGContext s; > unsigned long patch_size; > -- mailto:av1...@comtv.ru