diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2011-07-15 21:38:12 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-08-21 15:32:21 +0000 |
| commit | 3feaca9e88ddc72b3a9d7388fd542d1c0a5c24fb (patch) | |
| tree | 2f7fd97407e511363b1c2c819e16f492e416e522 | |
| parent | 92f562ec5655a7bd783d26b0da995c58436f9125 (diff) | |
| download | qemu-3feaca9e88ddc72b3a9d7388fd542d1c0a5c24fb.tar.gz | |
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 <agraf@suse.de>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Guan Xuetao<gxt@mprc.pku.edu.cn>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | target-s390x/translate.c | 2 | ||||
| -rw-r--r-- | 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 77fb4482aa..6a22fded57 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 a15e42d663..4ecb0f1704 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); |