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 4b4a72e556 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>
			
			
This commit is contained in:
		
							parent
							
								
									92f562ec56
								
							
						
					
					
						commit
						3feaca9e88
					
				| 
						 | 
				
			
			@ -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);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue