From: Aurelien Jarno <aurelien@aurel32.net>
To: Richard Henderson <rth@twiddle.net>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 11/18] tcg: Change tcg_gen_exit_tb argument to uintptr_t
Date: Thu, 29 Aug 2013 12:54:41 +0200 [thread overview]
Message-ID: <20130829105441.GO5908@ohm.aurel32.net> (raw)
In-Reply-To: <1377190729-14008-12-git-send-email-rth@twiddle.net>
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>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
next prev parent reply other threads:[~2013-08-29 10:55 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-22 16:58 [Qemu-devel] [PATCH 00/18] tcg: decouple tcg_target_long from pointer size Richard Henderson
2013-08-22 16:58 ` [Qemu-devel] [PATCH 01/18] qtest: Fix FMT_timeval vs time_t Richard Henderson
2013-08-22 17:09 ` Andreas Färber
2013-08-22 17:53 ` Richard Henderson
2013-08-22 18:01 ` Andreas Färber
2013-08-22 18:05 ` Richard Henderson
2013-08-22 16:58 ` [Qemu-devel] [PATCH 02/18] tcg: Change flush_icache_range arguments to uintptr_t Richard Henderson
2013-08-28 21:06 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 03/18] tcg: Change tcg_qemu_tb_exec return " Richard Henderson
2013-08-28 21:06 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 04/18] tcg: Fix next_tb type in cpu_exec Richard Henderson
2013-08-28 21:07 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 05/18] tcg: Define TCG_TYPE_PTR properly Richard Henderson
2013-08-29 10:53 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 06/18] tcg: Define TCG_ptr properly Richard Henderson
2013-08-29 10:53 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 07/18] tcg: Change frame pointer offsets to intptr_t Richard Henderson
2013-08-29 10:53 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 08/18] tcg: Change memory " Richard Henderson
2013-08-29 10:53 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 09/18] tcg: Change relocation " Richard Henderson
2013-08-29 10:53 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 10/18] tcg: Use uintptr_t in TCGHelperInfo Richard Henderson
2013-08-29 10:53 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 11/18] tcg: Change tcg_gen_exit_tb argument to uintptr_t Richard Henderson
2013-08-29 10:54 ` Aurelien Jarno [this message]
2013-08-22 16:58 ` [Qemu-devel] [PATCH 12/18] tcg: Change tcg_out_ld/st offset to intptr_t Richard Henderson
2013-08-29 16:44 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 13/18] tcg: Use appropriate types in tcg_reg_alloc_call Richard Henderson
2013-08-29 16:44 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 14/18] tcg: Fix jit debug for pointer size != register size Richard Henderson
2013-08-29 16:44 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 15/18] tcg: Allow TCG_TARGET_REG_BITS to be specified independantly Richard Henderson
2013-08-29 16:45 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 16/18] tcg-i386: Use intptr_t appropriately Richard Henderson
2013-08-29 16:45 ` Aurelien Jarno
2013-08-22 16:58 ` [Qemu-devel] [PATCH 17/18] tcg-i386: Adjust tcg_out_tlb_load for x32 Richard Henderson
2013-08-29 16:45 ` Aurelien Jarno
2013-08-29 17:53 ` Richard Henderson
2013-08-29 20:52 ` Richard Henderson
2013-08-22 16:58 ` [Qemu-devel] [PATCH 18/18] configure: Allow x32 as a host Richard Henderson
2013-08-29 16:45 ` Aurelien Jarno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130829105441.GO5908@ohm.aurel32.net \
--to=aurelien@aurel32.net \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.