| Message ID | 1377190729-14008-12-git-send-email-rth@twiddle.net |
|---|---|
| State | New |
| Headers | show |
On Thu, Aug 22, 2013 at 09:58:42AM -0700, Richard Henderson wrote: > And update all users. > > Signed-off-by: Richard Henderson <rth@twiddle.net> > --- > include/exec/gen-icount.h | 4 ++-- > target-alpha/translate.c | 8 ++++---- > target-arm/translate.c | 2 +- > target-cris/translate.c | 2 +- > target-i386/translate.c | 2 +- > target-lm32/translate.c | 2 +- > target-m68k/translate.c | 2 +- > target-microblaze/translate.c | 2 +- > target-mips/translate.c | 2 +- > target-moxie/translate.c | 2 +- > target-openrisc/translate.c | 2 +- > target-ppc/translate.c | 2 +- > target-s390x/translate.c | 8 ++++---- > target-sh4/translate.c | 2 +- > target-sparc/translate.c | 2 +- > target-unicore32/translate.c | 2 +- > target-xtensa/translate.c | 2 +- > tcg/tcg-op.h | 2 +- > 18 files changed, 25 insertions(+), 25 deletions(-) > > diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h > index 4fc7b29..39a6b61 100644 > --- a/include/exec/gen-icount.h > +++ b/include/exec/gen-icount.h > @@ -39,12 +39,12 @@ static inline void gen_tb_start(void) > static void gen_tb_end(TranslationBlock *tb, int num_insns) > { > gen_set_label(exitreq_label); > - tcg_gen_exit_tb((tcg_target_long)tb + TB_EXIT_REQUESTED); > + tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_REQUESTED); > > if (use_icount) { > *icount_arg = num_insns; > gen_set_label(icount_label); > - tcg_gen_exit_tb((tcg_target_long)tb + TB_EXIT_ICOUNT_EXPIRED); > + tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_ICOUNT_EXPIRED); > } > } > > diff --git a/target-alpha/translate.c b/target-alpha/translate.c > index 309dea6..28ce436 100644 > --- a/target-alpha/translate.c > +++ b/target-alpha/translate.c > @@ -415,7 +415,7 @@ static ExitStatus gen_bdirect(DisasContext *ctx, int ra, int32_t disp) > } else if (use_goto_tb(ctx, dest)) { > tcg_gen_goto_tb(0); > tcg_gen_movi_i64(cpu_pc, dest); > - tcg_gen_exit_tb((tcg_target_long)ctx->tb); > + tcg_gen_exit_tb((uintptr_t)ctx->tb); > return EXIT_GOTO_TB; > } else { > tcg_gen_movi_i64(cpu_pc, dest); > @@ -434,12 +434,12 @@ static ExitStatus gen_bcond_internal(DisasContext *ctx, TCGCond cond, > > tcg_gen_goto_tb(0); > tcg_gen_movi_i64(cpu_pc, ctx->pc); > - tcg_gen_exit_tb((tcg_target_long)ctx->tb); > + tcg_gen_exit_tb((uintptr_t)ctx->tb); > > gen_set_label(lab_true); > tcg_gen_goto_tb(1); > tcg_gen_movi_i64(cpu_pc, dest); > - tcg_gen_exit_tb((tcg_target_long)ctx->tb + 1); > + tcg_gen_exit_tb((uintptr_t)ctx->tb + 1); > > return EXIT_GOTO_TB; > } else { > @@ -1629,7 +1629,7 @@ static ExitStatus gen_call_pal(DisasContext *ctx, int palcode) > we change the PAL base register. */ > if (!ctx->singlestep_enabled && !(ctx->tb->cflags & CF_LAST_IO)) { > tcg_gen_goto_tb(0); > - tcg_gen_exit_tb((tcg_target_long)ctx->tb); > + tcg_gen_exit_tb((uintptr_t)ctx->tb); > return EXIT_GOTO_TB; > } > > diff --git a/target-arm/translate.c b/target-arm/translate.c > index d1e8538..9160ced 100644 > --- a/target-arm/translate.c > +++ b/target-arm/translate.c > @@ -3356,7 +3356,7 @@ static inline void gen_goto_tb(DisasContext *s, int n, uint32_t dest) > if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { > tcg_gen_goto_tb(n); > gen_set_pc_im(dest); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > gen_set_pc_im(dest); > tcg_gen_exit_tb(0); > diff --git a/target-cris/translate.c b/target-cris/translate.c > index 2a4beeb..617e1b4 100644 > --- a/target-cris/translate.c > +++ b/target-cris/translate.c > @@ -558,7 +558,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) > if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { > tcg_gen_goto_tb(n); > tcg_gen_movi_tl(env_pc, dest); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > tcg_gen_movi_tl(env_pc, dest); > tcg_gen_exit_tb(0); > diff --git a/target-i386/translate.c b/target-i386/translate.c > index 065a9d3..6d87900 100644 > --- a/target-i386/translate.c > +++ b/target-i386/translate.c > @@ -2413,7 +2413,7 @@ static inline void gen_goto_tb(DisasContext *s, int tb_num, target_ulong eip) > /* jump to same page: we can use a direct jump */ > tcg_gen_goto_tb(tb_num); > gen_jmp_im(eip); > - tcg_gen_exit_tb((tcg_target_long)tb + tb_num); > + tcg_gen_exit_tb((uintptr_t)tb + tb_num); > } else { > /* jump to another page: currently not optimized */ > gen_jmp_im(eip); > diff --git a/target-lm32/translate.c b/target-lm32/translate.c > index 1247287..6ea0ecd 100644 > --- a/target-lm32/translate.c > +++ b/target-lm32/translate.c > @@ -129,7 +129,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) > likely(!dc->singlestep_enabled)) { > tcg_gen_goto_tb(n); > tcg_gen_movi_tl(cpu_pc, dest); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > tcg_gen_movi_tl(cpu_pc, dest); > if (dc->singlestep_enabled) { > diff --git a/target-m68k/translate.c b/target-m68k/translate.c > index d562eeb..0be0a96 100644 > --- a/target-m68k/translate.c > +++ b/target-m68k/translate.c > @@ -869,7 +869,7 @@ static void gen_jmp_tb(DisasContext *s, int n, uint32_t dest) > (s->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { > tcg_gen_goto_tb(n); > tcg_gen_movi_i32(QREG_PC, dest); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > gen_jmp_im(s, dest); > tcg_gen_exit_tb(0); > diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c > index cd43577..0673176 100644 > --- a/target-microblaze/translate.c > +++ b/target-microblaze/translate.c > @@ -138,7 +138,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) > if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { > tcg_gen_goto_tb(n); > tcg_gen_movi_tl(cpu_SR[SR_PC], dest); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > tcg_gen_movi_tl(cpu_SR[SR_PC], dest); > tcg_gen_exit_tb(0); > diff --git a/target-mips/translate.c b/target-mips/translate.c > index e2eb908..ad43d59 100644 > --- a/target-mips/translate.c > +++ b/target-mips/translate.c > @@ -3581,7 +3581,7 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) > likely(!ctx->singlestep_enabled)) { > tcg_gen_goto_tb(n); > gen_save_pc(dest); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > gen_save_pc(dest); > if (ctx->singlestep_enabled) { > diff --git a/target-moxie/translate.c b/target-moxie/translate.c > index 8cc0bb7..a93196f 100644 > --- a/target-moxie/translate.c > +++ b/target-moxie/translate.c > @@ -135,7 +135,7 @@ static inline void gen_goto_tb(CPUMoxieState *env, DisasContext *ctx, > !ctx->singlestep_enabled) { > tcg_gen_goto_tb(n); > tcg_gen_movi_i32(cpu_pc, dest); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > tcg_gen_movi_i32(cpu_pc, dest); > if (ctx->singlestep_enabled) { > diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c > index a6050ba..723b77d 100644 > --- a/target-openrisc/translate.c > +++ b/target-openrisc/translate.c > @@ -198,7 +198,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) > likely(!dc->singlestep_enabled)) { > tcg_gen_movi_tl(cpu_pc, dest); > tcg_gen_goto_tb(n); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > tcg_gen_movi_tl(cpu_pc, dest); > if (dc->singlestep_enabled) { > diff --git a/target-ppc/translate.c b/target-ppc/translate.c > index f07d70d..2ffb270 100644 > --- a/target-ppc/translate.c > +++ b/target-ppc/translate.c > @@ -3551,7 +3551,7 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) > likely(!ctx->singlestep_enabled)) { > tcg_gen_goto_tb(n); > tcg_gen_movi_tl(cpu_nip, dest & ~3); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > tcg_gen_movi_tl(cpu_nip, dest & ~3); > if (unlikely(ctx->singlestep_enabled)) { > diff --git a/target-s390x/translate.c b/target-s390x/translate.c > index 1fb76c5..afe90eb 100644 > --- a/target-s390x/translate.c > +++ b/target-s390x/translate.c > @@ -1169,7 +1169,7 @@ static ExitStatus help_goto_direct(DisasContext *s, uint64_t dest) > update_cc_op(s); > tcg_gen_goto_tb(0); > tcg_gen_movi_i64(psw_addr, dest); > - tcg_gen_exit_tb((tcg_target_long)s->tb); > + tcg_gen_exit_tb((uintptr_t)s->tb); > return EXIT_GOTO_TB; > } else { > tcg_gen_movi_i64(psw_addr, dest); > @@ -1227,13 +1227,13 @@ static ExitStatus help_branch(DisasContext *s, DisasCompare *c, > /* Branch not taken. */ > tcg_gen_goto_tb(0); > tcg_gen_movi_i64(psw_addr, s->next_pc); > - tcg_gen_exit_tb((tcg_target_long)s->tb + 0); > + tcg_gen_exit_tb((uintptr_t)s->tb + 0); > > /* Branch taken. */ > gen_set_label(lab); > tcg_gen_goto_tb(1); > tcg_gen_movi_i64(psw_addr, dest); > - tcg_gen_exit_tb((tcg_target_long)s->tb + 1); > + tcg_gen_exit_tb((uintptr_t)s->tb + 1); > > ret = EXIT_GOTO_TB; > } else { > @@ -1256,7 +1256,7 @@ static ExitStatus help_branch(DisasContext *s, DisasCompare *c, > update_cc_op(s); > tcg_gen_goto_tb(0); > tcg_gen_movi_i64(psw_addr, s->next_pc); > - tcg_gen_exit_tb((tcg_target_long)s->tb + 0); > + tcg_gen_exit_tb((uintptr_t)s->tb + 0); > > gen_set_label(lab); > if (is_imm) { > diff --git a/target-sh4/translate.c b/target-sh4/translate.c > index 59f3d47..c06b29f 100644 > --- a/target-sh4/translate.c > +++ b/target-sh4/translate.c > @@ -186,7 +186,7 @@ static void gen_goto_tb(DisasContext * ctx, int n, target_ulong dest) > /* Use a direct jump if in same page and singlestep not enabled */ > tcg_gen_goto_tb(n); > tcg_gen_movi_i32(cpu_pc, dest); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > tcg_gen_movi_i32(cpu_pc, dest); > if (ctx->singlestep_enabled) > diff --git a/target-sparc/translate.c b/target-sparc/translate.c > index 093e0e2..36615f1 100644 > --- a/target-sparc/translate.c > +++ b/target-sparc/translate.c > @@ -322,7 +322,7 @@ static inline void gen_goto_tb(DisasContext *s, int tb_num, > tcg_gen_goto_tb(tb_num); > tcg_gen_movi_tl(cpu_pc, pc); > tcg_gen_movi_tl(cpu_npc, npc); > - tcg_gen_exit_tb((tcg_target_long)tb + tb_num); > + tcg_gen_exit_tb((uintptr_t)tb + tb_num); > } else { > /* jump to another page: currently not optimized */ > tcg_gen_movi_tl(cpu_pc, pc); > diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c > index 68be1c6..1246895 100644 > --- a/target-unicore32/translate.c > +++ b/target-unicore32/translate.c > @@ -1100,7 +1100,7 @@ static inline void gen_goto_tb(DisasContext *s, int n, uint32_t dest) > if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { > tcg_gen_goto_tb(n); > gen_set_pc_im(dest); > - tcg_gen_exit_tb((tcg_target_long)tb + n); > + tcg_gen_exit_tb((uintptr_t)tb + n); > } else { > gen_set_pc_im(dest); > tcg_gen_exit_tb(0); > diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c > index 504cc53..24343bd 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); > } > diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h > index 364964d..32a5deb 100644 > --- a/tcg/tcg-op.h > +++ b/tcg/tcg-op.h > @@ -2599,7 +2599,7 @@ static inline void tcg_gen_debug_insn_start(uint64_t pc) > #endif > } > > -static inline void tcg_gen_exit_tb(tcg_target_long val) > +static inline void tcg_gen_exit_tb(uintptr_t val) > { > tcg_gen_op1i(INDEX_op_exit_tb, val); > } > -- > 1.8.1.4 Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index 4fc7b29..39a6b61 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -39,12 +39,12 @@ static inline void gen_tb_start(void) static void gen_tb_end(TranslationBlock *tb, int num_insns) { gen_set_label(exitreq_label); - tcg_gen_exit_tb((tcg_target_long)tb + TB_EXIT_REQUESTED); + tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_REQUESTED); if (use_icount) { *icount_arg = num_insns; gen_set_label(icount_label); - tcg_gen_exit_tb((tcg_target_long)tb + TB_EXIT_ICOUNT_EXPIRED); + tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_ICOUNT_EXPIRED); } } diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 309dea6..28ce436 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -415,7 +415,7 @@ static ExitStatus gen_bdirect(DisasContext *ctx, int ra, int32_t disp) } else if (use_goto_tb(ctx, dest)) { tcg_gen_goto_tb(0); tcg_gen_movi_i64(cpu_pc, dest); - tcg_gen_exit_tb((tcg_target_long)ctx->tb); + tcg_gen_exit_tb((uintptr_t)ctx->tb); return EXIT_GOTO_TB; } else { tcg_gen_movi_i64(cpu_pc, dest); @@ -434,12 +434,12 @@ static ExitStatus gen_bcond_internal(DisasContext *ctx, TCGCond cond, tcg_gen_goto_tb(0); tcg_gen_movi_i64(cpu_pc, ctx->pc); - tcg_gen_exit_tb((tcg_target_long)ctx->tb); + tcg_gen_exit_tb((uintptr_t)ctx->tb); gen_set_label(lab_true); tcg_gen_goto_tb(1); tcg_gen_movi_i64(cpu_pc, dest); - tcg_gen_exit_tb((tcg_target_long)ctx->tb + 1); + tcg_gen_exit_tb((uintptr_t)ctx->tb + 1); return EXIT_GOTO_TB; } else { @@ -1629,7 +1629,7 @@ static ExitStatus gen_call_pal(DisasContext *ctx, int palcode) we change the PAL base register. */ if (!ctx->singlestep_enabled && !(ctx->tb->cflags & CF_LAST_IO)) { tcg_gen_goto_tb(0); - tcg_gen_exit_tb((tcg_target_long)ctx->tb); + tcg_gen_exit_tb((uintptr_t)ctx->tb); return EXIT_GOTO_TB; } diff --git a/target-arm/translate.c b/target-arm/translate.c index d1e8538..9160ced 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -3356,7 +3356,7 @@ static inline void gen_goto_tb(DisasContext *s, int n, uint32_t dest) if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { tcg_gen_goto_tb(n); gen_set_pc_im(dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { gen_set_pc_im(dest); tcg_gen_exit_tb(0); diff --git a/target-cris/translate.c b/target-cris/translate.c index 2a4beeb..617e1b4 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -558,7 +558,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { tcg_gen_goto_tb(n); tcg_gen_movi_tl(env_pc, dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { tcg_gen_movi_tl(env_pc, dest); tcg_gen_exit_tb(0); diff --git a/target-i386/translate.c b/target-i386/translate.c index 065a9d3..6d87900 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -2413,7 +2413,7 @@ static inline void gen_goto_tb(DisasContext *s, int tb_num, target_ulong eip) /* jump to same page: we can use a direct jump */ tcg_gen_goto_tb(tb_num); gen_jmp_im(eip); - tcg_gen_exit_tb((tcg_target_long)tb + tb_num); + tcg_gen_exit_tb((uintptr_t)tb + tb_num); } else { /* jump to another page: currently not optimized */ gen_jmp_im(eip); diff --git a/target-lm32/translate.c b/target-lm32/translate.c index 1247287..6ea0ecd 100644 --- a/target-lm32/translate.c +++ b/target-lm32/translate.c @@ -129,7 +129,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) likely(!dc->singlestep_enabled)) { tcg_gen_goto_tb(n); tcg_gen_movi_tl(cpu_pc, dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { tcg_gen_movi_tl(cpu_pc, dest); if (dc->singlestep_enabled) { diff --git a/target-m68k/translate.c b/target-m68k/translate.c index d562eeb..0be0a96 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -869,7 +869,7 @@ static void gen_jmp_tb(DisasContext *s, int n, uint32_t dest) (s->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { tcg_gen_goto_tb(n); tcg_gen_movi_i32(QREG_PC, dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { gen_jmp_im(s, dest); tcg_gen_exit_tb(0); diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index cd43577..0673176 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -138,7 +138,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { tcg_gen_goto_tb(n); tcg_gen_movi_tl(cpu_SR[SR_PC], dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { tcg_gen_movi_tl(cpu_SR[SR_PC], dest); tcg_gen_exit_tb(0); diff --git a/target-mips/translate.c b/target-mips/translate.c index e2eb908..ad43d59 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -3581,7 +3581,7 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) likely(!ctx->singlestep_enabled)) { tcg_gen_goto_tb(n); gen_save_pc(dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { gen_save_pc(dest); if (ctx->singlestep_enabled) { diff --git a/target-moxie/translate.c b/target-moxie/translate.c index 8cc0bb7..a93196f 100644 --- a/target-moxie/translate.c +++ b/target-moxie/translate.c @@ -135,7 +135,7 @@ static inline void gen_goto_tb(CPUMoxieState *env, DisasContext *ctx, !ctx->singlestep_enabled) { tcg_gen_goto_tb(n); tcg_gen_movi_i32(cpu_pc, dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { tcg_gen_movi_i32(cpu_pc, dest); if (ctx->singlestep_enabled) { diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c index a6050ba..723b77d 100644 --- a/target-openrisc/translate.c +++ b/target-openrisc/translate.c @@ -198,7 +198,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) likely(!dc->singlestep_enabled)) { tcg_gen_movi_tl(cpu_pc, dest); tcg_gen_goto_tb(n); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { tcg_gen_movi_tl(cpu_pc, dest); if (dc->singlestep_enabled) { diff --git a/target-ppc/translate.c b/target-ppc/translate.c index f07d70d..2ffb270 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -3551,7 +3551,7 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) likely(!ctx->singlestep_enabled)) { tcg_gen_goto_tb(n); tcg_gen_movi_tl(cpu_nip, dest & ~3); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { tcg_gen_movi_tl(cpu_nip, dest & ~3); if (unlikely(ctx->singlestep_enabled)) { diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 1fb76c5..afe90eb 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1169,7 +1169,7 @@ static ExitStatus help_goto_direct(DisasContext *s, uint64_t dest) update_cc_op(s); tcg_gen_goto_tb(0); tcg_gen_movi_i64(psw_addr, dest); - tcg_gen_exit_tb((tcg_target_long)s->tb); + tcg_gen_exit_tb((uintptr_t)s->tb); return EXIT_GOTO_TB; } else { tcg_gen_movi_i64(psw_addr, dest); @@ -1227,13 +1227,13 @@ static ExitStatus help_branch(DisasContext *s, DisasCompare *c, /* Branch not taken. */ tcg_gen_goto_tb(0); tcg_gen_movi_i64(psw_addr, s->next_pc); - tcg_gen_exit_tb((tcg_target_long)s->tb + 0); + tcg_gen_exit_tb((uintptr_t)s->tb + 0); /* Branch taken. */ gen_set_label(lab); tcg_gen_goto_tb(1); tcg_gen_movi_i64(psw_addr, dest); - tcg_gen_exit_tb((tcg_target_long)s->tb + 1); + tcg_gen_exit_tb((uintptr_t)s->tb + 1); ret = EXIT_GOTO_TB; } else { @@ -1256,7 +1256,7 @@ static ExitStatus help_branch(DisasContext *s, DisasCompare *c, update_cc_op(s); tcg_gen_goto_tb(0); tcg_gen_movi_i64(psw_addr, s->next_pc); - tcg_gen_exit_tb((tcg_target_long)s->tb + 0); + tcg_gen_exit_tb((uintptr_t)s->tb + 0); gen_set_label(lab); if (is_imm) { diff --git a/target-sh4/translate.c b/target-sh4/translate.c index 59f3d47..c06b29f 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -186,7 +186,7 @@ static void gen_goto_tb(DisasContext * ctx, int n, target_ulong dest) /* Use a direct jump if in same page and singlestep not enabled */ tcg_gen_goto_tb(n); tcg_gen_movi_i32(cpu_pc, dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { tcg_gen_movi_i32(cpu_pc, dest); if (ctx->singlestep_enabled) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 093e0e2..36615f1 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -322,7 +322,7 @@ static inline void gen_goto_tb(DisasContext *s, int tb_num, tcg_gen_goto_tb(tb_num); tcg_gen_movi_tl(cpu_pc, pc); tcg_gen_movi_tl(cpu_npc, npc); - tcg_gen_exit_tb((tcg_target_long)tb + tb_num); + tcg_gen_exit_tb((uintptr_t)tb + tb_num); } else { /* jump to another page: currently not optimized */ tcg_gen_movi_tl(cpu_pc, pc); diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c index 68be1c6..1246895 100644 --- a/target-unicore32/translate.c +++ b/target-unicore32/translate.c @@ -1100,7 +1100,7 @@ static inline void gen_goto_tb(DisasContext *s, int n, uint32_t dest) if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) { tcg_gen_goto_tb(n); gen_set_pc_im(dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { gen_set_pc_im(dest); tcg_gen_exit_tb(0); diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 504cc53..24343bd 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); } diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index 364964d..32a5deb 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -2599,7 +2599,7 @@ static inline void tcg_gen_debug_insn_start(uint64_t pc) #endif } -static inline void tcg_gen_exit_tb(tcg_target_long val) +static inline void tcg_gen_exit_tb(uintptr_t val) { tcg_gen_op1i(INDEX_op_exit_tb, val); }
And update all users. Signed-off-by: Richard Henderson <rth@twiddle.net> --- include/exec/gen-icount.h | 4 ++-- target-alpha/translate.c | 8 ++++---- target-arm/translate.c | 2 +- target-cris/translate.c | 2 +- target-i386/translate.c | 2 +- target-lm32/translate.c | 2 +- target-m68k/translate.c | 2 +- target-microblaze/translate.c | 2 +- target-mips/translate.c | 2 +- target-moxie/translate.c | 2 +- target-openrisc/translate.c | 2 +- target-ppc/translate.c | 2 +- target-s390x/translate.c | 8 ++++---- target-sh4/translate.c | 2 +- target-sparc/translate.c | 2 +- target-unicore32/translate.c | 2 +- target-xtensa/translate.c | 2 +- tcg/tcg-op.h | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-)