From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhoDq-0006t2-6b for qemu-devel@nongnu.org; Fri, 15 Jul 2011 15:38:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QhoDl-0003GD-CW for qemu-devel@nongnu.org; Fri, 15 Jul 2011 15:38:49 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:50043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhoDl-0003G4-49 for qemu-devel@nongnu.org; Fri, 15 Jul 2011 15:38:45 -0400 From: Stefan Weil Date: Fri, 15 Jul 2011 21:38:12 +0200 Message-Id: <1310758694-6360-2-git-send-email-weil@mail.berlios.de> In-Reply-To: <1310758694-6360-1-git-send-email-weil@mail.berlios.de> References: <1310758694-6360-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH 1/3] Fix conversions from pointer to tcg_target_long List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: Guan Xuetao , QEMU Developers , Alexander Graf 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 Signed-off-by: Stefan Weil --- target-s390x/translate.c | 2 +- target-unicore32/translate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); -- 1.7.2.5