From: Stefan Weil Date: Fri, 15 Jul 2011 19:38:12 +0000 (+0200) Subject: Fix conversions from pointer to tcg_target_long X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~5547 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3feaca9e88ddc72b3a9d7388fd542d1c0a5c24fb;p=sdk%2Femulator%2Fqemu.git Fix conversions from pointer to tcg_target_long tcg_gen_exit_tb takes a parameter of type tcg_target_long, so the type casts of pointer to long should be replaced by type casts of pointer to tcg_target_long. These changes are needed for build environments where sizeof(long) != sizeof(void *), especially for w64. See 4b4a72e55660abf7efe85aca78762dcfea5519ad which fixed the same issue for the other targets. Cc: Alexander Graf Cc: Guan Xuetao Acked-by: Guan Xuetao Acked-by: Alexander Graf Signed-off-by: Stefan Weil Signed-off-by: Blue Swirl --- diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 77fb448..6a22fde 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -830,7 +830,7 @@ static inline void gen_goto_tb(DisasContext *s, int tb_num, target_ulong pc) /* jump to same page: we can use a direct jump */ tcg_gen_goto_tb(tb_num); tcg_gen_movi_i64(psw_addr, pc); - tcg_gen_exit_tb((long)tb + tb_num); + tcg_gen_exit_tb((tcg_target_long)tb + tb_num); } else { /* jump to another page: currently not optimized */ tcg_gen_movi_i64(psw_addr, pc); diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c index a15e42d..4ecb0f1 100644 --- a/target-unicore32/translate.c +++ b/target-unicore32/translate.c @@ -1056,7 +1056,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((long)tb + n); + tcg_gen_exit_tb((tcg_target_long)tb + n); } else { gen_set_pc_im(dest); tcg_gen_exit_tb(0);