From 63b56b8bd8990f64283b3f5128ac9ba0ccc258cb Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 5 Feb 2011 15:19:08 +0100 Subject: [PATCH] Fix conversions from pointer to integral type and vice versa These conversions should always use uintptr_t instead of long or unsigned long. They are needed for environments where sizeof(long) != sizeof(void *). Signed-off-by: Stefan Weil --- cpu-all.h | 4 +- cpu-common.h | 2 +- cpu-defs.h | 3 +- cpu-exec.c | 6 ++-- disas.c | 8 ++-- dyngen-exec.h | 7 ++-- exec-all.h | 14 ++++---- exec.c | 80 +++++++++++++++++++++------------------- gen-icount.h | 2 +- hw/ppc405_boards.c | 9 +++-- migration-tcp.c | 4 +- qemu-timer.c | 4 +- slirp/cksum.c | 2 +- softmmu_header.h | 6 ++-- softmmu_template.h | 12 +++--- target-alpha/op_helper.c | 2 +- target-alpha/translate.c | 6 ++-- target-arm/op_helper.c | 4 +- target-arm/translate.c | 2 +- target-cris/op_helper.c | 4 +- target-cris/translate.c | 2 +- target-i386/op_helper.c | 4 +- target-i386/translate.c | 2 +- target-m68k/op_helper.c | 4 +- target-m68k/translate.c | 2 +- target-microblaze/op_helper.c | 4 +- target-microblaze/translate.c | 2 +- target-mips/op_helper.c | 8 ++-- target-mips/translate.c | 2 +- target-ppc/op_helper.c | 4 +- target-ppc/translate.c | 2 +- target-ppc/translate_init.c | 6 ++-- target-s390x/op_helper.c | 4 +- target-sh4/op_helper.c | 4 +- target-sh4/translate.c | 2 +- target-sparc/op_helper.c | 6 ++-- target-sparc/translate.c | 2 +- tcg/tcg.c | 10 +++--- translate-all.c | 6 ++-- 39 files changed, 131 insertions(+), 126 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index ffbd6a4..f092cef 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -660,8 +660,8 @@ extern unsigned long reserved_va; #else /* !CONFIG_USER_ONLY */ /* NOTE: we use double casts if pointers and target_ulong have different sizes */ -#define saddr(x) (uint8_t *)(long)(x) -#define laddr(x) (uint8_t *)(long)(x) +#define saddr(x) (uint8_t *)(uintptr_t)(x) +#define laddr(x) (uint8_t *)(uintptr_t)(x) #endif #define ldub_raw(p) ldub_p(laddr((p))) diff --git a/cpu-common.h b/cpu-common.h index 6d4a898..a30bb98 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -27,7 +27,7 @@ enum device_endian { }; /* address in the RAM (different from a physical address) */ -typedef unsigned long ram_addr_t; +typedef uintptr_t ram_addr_t; /* memory API */ diff --git a/cpu-defs.h b/cpu-defs.h index 8d4bf86..8b8396c 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -154,8 +154,7 @@ typedef struct CPUWatchpoint { /* in order to avoid passing too many arguments to the MMIO \ helpers, we store some rarely used information in the CPU \ context) */ \ - unsigned long mem_io_pc; /* host pc at which the memory was \ - accessed */ \ + uintptr_t mem_io_pc; /* host pc at which the memory was accessed */ \ target_ulong mem_io_vaddr; /* target virtual addr at which the \ memory was accessed */ \ uint32_t halted; /* Nonzero if the CPU is in suspend state */ \ diff --git a/cpu-exec.c b/cpu-exec.c index 8c9fb8b..5a30e3e 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -228,7 +228,7 @@ int cpu_exec(CPUState *env1) int ret, interrupt_request; TranslationBlock *tb; uint8_t *tc_ptr; - unsigned long next_tb; + uintptr_t next_tb; if (cpu_halted(env1) == EXCP_HALTED) return EXCP_HALTED; @@ -615,7 +615,7 @@ int cpu_exec(CPUState *env1) if ((next_tb & 3) == 2) { /* Instruction counter expired. */ int insns_left; - tb = (TranslationBlock *)(long)(next_tb & ~3); + tb = (TranslationBlock *)(uintptr_t)(next_tb & ~3); /* Restore PC. */ cpu_pc_from_tb(env, tb); insns_left = env->icount_decr.u32; @@ -749,7 +749,7 @@ void cpu_x86_frstor(CPUX86State *s, target_ulong ptr, int data32) the effective address of the memory exception. 'is_write' is 1 if a write caused the exception and otherwise 0'. 'old_set' is the signal set which should be restored */ -static inline int handle_cpu_signal(unsigned long pc, unsigned long address, +static inline int handle_cpu_signal(uintptr_t pc, unsigned long address, int is_write, sigset_t *old_set, void *puc) { diff --git a/disas.c b/disas.c index c76f36f..f06a49a 100644 --- a/disas.c +++ b/disas.c @@ -255,7 +255,7 @@ void target_disas(FILE *out, target_ulong code, target_ulong size, int flags) /* Disassemble this for me please... (debugging). */ void disas(FILE *out, void *code, unsigned long size) { - unsigned long pc; + uintptr_t pc; int count; struct disassemble_info disasm_info; int (*print_insn)(bfd_vma pc, disassemble_info *info); @@ -263,7 +263,7 @@ void disas(FILE *out, void *code, unsigned long size) INIT_DISASSEMBLE_INFO(disasm_info, out, fprintf); disasm_info.buffer = code; - disasm_info.buffer_vma = (unsigned long)code; + disasm_info.buffer_vma = (uintptr_t)code; disasm_info.buffer_length = size; #ifdef HOST_WORDS_BIGENDIAN @@ -305,8 +305,8 @@ void disas(FILE *out, void *code, unsigned long size) (long) code); return; #endif - for (pc = (unsigned long)code; size > 0; pc += count, size -= count) { - fprintf(out, "0x%08lx: ", pc); + for (pc = (uintptr_t)code; size > 0; pc += count, size -= count) { + fprintf(out, "0x%08" PRIxPTR ": ", pc); count = print_insn(pc, &disasm_info); fprintf(out, "\n"); if (count < 0) diff --git a/dyngen-exec.h b/dyngen-exec.h index db00fba..b3e34e4 100644 --- a/dyngen-exec.h +++ b/dyngen-exec.h @@ -72,13 +72,14 @@ typedef void * host_reg_t; /* The return address may point to the start of the next instruction. Subtracting one gets us the call instruction itself. */ #if defined(__s390__) && !defined(__s390x__) -# define GETPC() ((void*)(((unsigned long)__builtin_return_address(0) & 0x7fffffffUL) - 1)) +# define GETPC() \ + ((void *)(((uintptr_t)__builtin_return_address(0) & 0x7fffffffUL) - 1)) #elif defined(__arm__) /* Thumb return addresses have the low bit set, so we need to subtract two. This is still safe in ARM mode because instructions are 4 bytes. */ -# define GETPC() ((void *)((unsigned long)__builtin_return_address(0) - 2)) +# define GETPC() ((void *)((uintptr_t)__builtin_return_address(0) - 2)) #else -# define GETPC() ((void *)((unsigned long)__builtin_return_address(0) - 1)) +# define GETPC() ((void *)((uintptr_t)__builtin_return_address(0) - 1)) #endif #endif /* !defined(__DYNGEN_EXEC_H__) */ diff --git a/exec-all.h b/exec-all.h index e3a82bc..d122613 100644 --- a/exec-all.h +++ b/exec-all.h @@ -84,7 +84,7 @@ void cpu_gen_init(void); int cpu_gen_code(CPUState *env, struct TranslationBlock *tb, int *gen_code_size_ptr); int cpu_restore_state(struct TranslationBlock *tb, - CPUState *env, unsigned long searched_pc, + CPUState *env, uintptr_t searched_pc, void *puc); void cpu_resume_from_signal(CPUState *env1, void *puc); void cpu_io_recompile(CPUState *env, void *retaddr); @@ -195,7 +195,7 @@ extern TranslationBlock *tb_phys_hash[CODE_GEN_PHYS_HASH_SIZE]; void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr); #define tb_set_jmp_target1 ppc_tb_set_jmp_target #elif defined(__i386__) || defined(__x86_64__) -static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr) +static inline void tb_set_jmp_target1(uintptr_t jmp_addr, unsigned long addr) { /* patch the branch destination */ *(uint32_t *)jmp_addr = addr - (jmp_addr + 4); @@ -233,7 +233,7 @@ static inline void tb_set_jmp_target(TranslationBlock *tb, unsigned long offset; offset = tb->tb_jmp_offset[n]; - tb_set_jmp_target1((unsigned long)(tb->tc_ptr + offset), addr); + tb_set_jmp_target1((uintptr_t)(tb->tc_ptr + offset), addr); } #else @@ -253,15 +253,15 @@ static inline void tb_add_jump(TranslationBlock *tb, int n, /* NOTE: this test is only needed for thread safety */ if (!tb->jmp_next[n]) { /* patch the native jump address */ - tb_set_jmp_target(tb, n, (unsigned long)tb_next->tc_ptr); + tb_set_jmp_target(tb, n, (uintptr_t)tb_next->tc_ptr); /* add in TB jmp circular list */ tb->jmp_next[n] = tb_next->jmp_first; - tb_next->jmp_first = (TranslationBlock *)((long)(tb) | (n)); + tb_next->jmp_first = (TranslationBlock *)((uintptr_t)(tb) | (n)); } } -TranslationBlock *tb_find_pc(unsigned long pc_ptr); +TranslationBlock *tb_find_pc(uintptr_t pc_ptr); #include "qemu-lock.h" @@ -330,7 +330,7 @@ static inline tb_page_addr_t get_page_addr_code(CPUState *env1, target_ulong add cpu_abort(env1, "Trying to execute code outside RAM or ROM at 0x" TARGET_FMT_lx "\n", addr); #endif } - p = (void *)(unsigned long)addr + p = (void *)(uintptr_t)addr + env1->tlb_table[mmu_idx][page_index].addend; return qemu_ram_addr_from_host_nofail(p); } diff --git a/exec.c b/exec.c index e950df2..4d053d1 100644 --- a/exec.c +++ b/exec.c @@ -232,13 +232,14 @@ static void map_exec(void *addr, long size) #else static void map_exec(void *addr, long size) { - unsigned long start, end, page_size; + uintptr_t start, end; + unsigned long page_size; page_size = getpagesize(); - start = (unsigned long)addr; + start = (uintptr_t)addr; start &= ~(page_size - 1); - end = (unsigned long)addr + size; + end = (uintptr_t)addr + size; end += page_size - 1; end &= ~(page_size - 1); @@ -779,8 +780,8 @@ static inline void tb_page_remove(TranslationBlock **ptb, TranslationBlock *tb) for(;;) { tb1 = *ptb; - n1 = (long)tb1 & 3; - tb1 = (TranslationBlock *)((long)tb1 & ~3); + n1 = (uintptr_t)tb1 & 3; + tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); if (tb1 == tb) { *ptb = tb1->page_next[n1]; break; @@ -800,8 +801,8 @@ static inline void tb_jmp_remove(TranslationBlock *tb, int n) /* find tb(n) in circular list */ for(;;) { tb1 = *ptb; - n1 = (long)tb1 & 3; - tb1 = (TranslationBlock *)((long)tb1 & ~3); + n1 = (uintptr_t)tb1 & 3; + tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); if (n1 == n && tb1 == tb) break; if (n1 == 2) { @@ -821,7 +822,7 @@ static inline void tb_jmp_remove(TranslationBlock *tb, int n) another TB */ static inline void tb_reset_jump(TranslationBlock *tb, int n) { - tb_set_jmp_target(tb, n, (unsigned long)(tb->tc_ptr + tb->tb_next_offset[n])); + tb_set_jmp_target(tb, n, (uintptr_t)(tb->tc_ptr + tb->tb_next_offset[n])); } void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) @@ -866,16 +867,16 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) /* suppress any remaining jumps to this TB */ tb1 = tb->jmp_first; for(;;) { - n1 = (long)tb1 & 3; + n1 = (uintptr_t)tb1 & 3; if (n1 == 2) break; - tb1 = (TranslationBlock *)((long)tb1 & ~3); + tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); tb2 = tb1->jmp_next[n1]; tb_reset_jump(tb1, n1); tb1->jmp_next[n1] = NULL; tb1 = tb2; } - tb->jmp_first = (TranslationBlock *)((long)tb | 2); /* fail safe */ + tb->jmp_first = (TranslationBlock *)((uintptr_t)tb | 2); /* fail safe */ tb_phys_invalidate_count++; } @@ -916,8 +917,8 @@ static void build_page_bitmap(PageDesc *p) tb = p->first_tb; while (tb != NULL) { - n = (long)tb & 3; - tb = (TranslationBlock *)((long)tb & ~3); + n = (uintptr_t)tb & 3; + tb = (TranslationBlock *)((uintptr_t)tb & ~3); /* NOTE: this is subtle as a TB may span two physical pages */ if (n == 0) { /* NOTE: tb_end may be after the end of the page, but @@ -961,7 +962,8 @@ TranslationBlock *tb_gen_code(CPUState *env, tb->flags = flags; tb->cflags = cflags; cpu_gen_code(env, tb, &code_gen_size); - code_gen_ptr = (void *)(((unsigned long)code_gen_ptr + code_gen_size + CODE_GEN_ALIGN - 1) & ~(CODE_GEN_ALIGN - 1)); + code_gen_ptr = (void *)(((uintptr_t)code_gen_ptr + code_gen_size + + CODE_GEN_ALIGN - 1) & ~(CODE_GEN_ALIGN - 1)); /* check next page if needed */ virt_page2 = (pc + tb->size - 1) & TARGET_PAGE_MASK; @@ -1009,8 +1011,8 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, /* XXX: see if in some cases it could be faster to invalidate all the code */ tb = p->first_tb; while (tb != NULL) { - n = (long)tb & 3; - tb = (TranslationBlock *)((long)tb & ~3); + n = (uintptr_t)tb & 3; + tb = (TranslationBlock *)((uintptr_t)tb & ~3); tb_next = tb->page_next[n]; /* NOTE: this is subtle as a TB may span two physical pages */ if (n == 0) { @@ -1113,7 +1115,7 @@ static inline void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len) #if !defined(CONFIG_SOFTMMU) static void tb_invalidate_phys_page(tb_page_addr_t addr, - unsigned long pc, void *puc) + uintptr_t pc, void *puc) { TranslationBlock *tb; PageDesc *p; @@ -1183,7 +1185,7 @@ static inline void tb_alloc_page(TranslationBlock *tb, p = page_find_alloc(page_addr >> TARGET_PAGE_BITS, 1); tb->page_next[n] = p->first_tb; last_first_tb = p->first_tb; - p->first_tb = (TranslationBlock *)((long)tb | n); + p->first_tb = (TranslationBlock *)((uintptr_t)tb | n); invalidate_page_bitmap(p); #if defined(TARGET_HAS_SMC) || 1 @@ -1276,7 +1278,7 @@ void tb_link_page(TranslationBlock *tb, else tb->page_addr[1] = -1; - tb->jmp_first = (TranslationBlock *)((long)tb | 2); + tb->jmp_first = (TranslationBlock *)((uintptr_t)tb | 2); tb->jmp_next[0] = NULL; tb->jmp_next[1] = NULL; @@ -1294,24 +1296,25 @@ void tb_link_page(TranslationBlock *tb, /* find the TB 'tb' such that tb[0].tc_ptr <= tc_ptr < tb[1].tc_ptr. Return NULL if not found */ -TranslationBlock *tb_find_pc(unsigned long tc_ptr) +TranslationBlock *tb_find_pc(uintptr_t tc_ptr) { int m_min, m_max, m; - unsigned long v; + uintptr_t v; TranslationBlock *tb; if (nb_tbs <= 0) return NULL; - if (tc_ptr < (unsigned long)code_gen_buffer || - tc_ptr >= (unsigned long)code_gen_ptr) + if (tc_ptr < (uintptr_t)code_gen_buffer || + tc_ptr >= (uintptr_t)code_gen_ptr) { return NULL; + } /* binary search (cf Knuth) */ m_min = 0; m_max = nb_tbs - 1; while (m_min <= m_max) { m = (m_min + m_max) >> 1; tb = &tbs[m]; - v = (unsigned long)tb->tc_ptr; + v = (uintptr_t)tb->tc_ptr; if (v == tc_ptr) return tb; else if (tc_ptr < v) { @@ -1328,14 +1331,14 @@ static void tb_reset_jump_recursive(TranslationBlock *tb); static inline void tb_reset_jump_recursive2(TranslationBlock *tb, int n) { TranslationBlock *tb1, *tb_next, **ptb; - unsigned int n1; + uintptr_t n1; tb1 = tb->jmp_next[n]; if (tb1 != NULL) { /* find head of list */ for(;;) { - n1 = (long)tb1 & 3; - tb1 = (TranslationBlock *)((long)tb1 & ~3); + n1 = (uintptr_t)tb1 & 3; + tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); if (n1 == 2) break; tb1 = tb1->jmp_next[n1]; @@ -1347,8 +1350,8 @@ static inline void tb_reset_jump_recursive2(TranslationBlock *tb, int n) ptb = &tb_next->jmp_first; for(;;) { tb1 = *ptb; - n1 = (long)tb1 & 3; - tb1 = (TranslationBlock *)((long)tb1 & ~3); + n1 = (uintptr_t)tb1 & 3; + tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); if (n1 == n && tb1 == tb) break; ptb = &tb1->jmp_next[n1]; @@ -2025,7 +2028,8 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end, int dirty_flags) { CPUState *env; - unsigned long length, start1; + unsigned long length; + uintptr_t start1; int i; start &= TARGET_PAGE_MASK; @@ -2038,10 +2042,10 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end, /* we modify the TLB cache so that the dirty bit will be set again when accessing the range */ - start1 = (unsigned long)qemu_safe_ram_ptr(start); - /* Chek that we don't span multiple blocks - this breaks the + start1 = (uintptr_t)qemu_safe_ram_ptr(start); + /* Check that we don't span multiple blocks - this breaks the address comparisons below. */ - if ((unsigned long)qemu_safe_ram_ptr(end - 1) - start1 + if ((uintptr_t)qemu_safe_ram_ptr(end - 1) - start1 != (end - 1) - start) { abort(); } @@ -2084,7 +2088,7 @@ static inline void tlb_update_dirty(CPUTLBEntry *tlb_entry) void *p; if ((tlb_entry->addr_write & ~TARGET_PAGE_MASK) == IO_MEM_RAM) { - p = (void *)(unsigned long)((tlb_entry->addr_write & TARGET_PAGE_MASK) + p = (void *)(uintptr_t)((tlb_entry->addr_write & TARGET_PAGE_MASK) + tlb_entry->addend); ram_addr = qemu_ram_addr_from_host_nofail(p); if (!cpu_physical_memory_is_dirty(ram_addr)) { @@ -2158,7 +2162,7 @@ void tlb_set_page(CPUState *env, target_ulong vaddr, unsigned int index; target_ulong address; target_ulong code_address; - unsigned long addend; + uintptr_t addend; CPUTLBEntry *te; CPUWatchpoint *wp; target_phys_addr_t iotlb; @@ -2184,7 +2188,7 @@ void tlb_set_page(CPUState *env, target_ulong vaddr, /* IO memory case (romd handled later) */ address |= TLB_MMIO; } - addend = (unsigned long)qemu_get_ram_ptr(pd & TARGET_PAGE_MASK); + addend = (uintptr_t)qemu_get_ram_ptr(pd & TARGET_PAGE_MASK); if ((pd & ~TARGET_PAGE_MASK) <= IO_MEM_ROM) { /* Normal RAM. */ iotlb = pd & TARGET_PAGE_MASK; @@ -4190,13 +4194,13 @@ void cpu_io_recompile(CPUState *env, void *retaddr) target_ulong pc, cs_base; uint64_t flags; - tb = tb_find_pc((unsigned long)retaddr); + tb = tb_find_pc((uintptr_t)retaddr); if (!tb) { cpu_abort(env, "cpu_io_recompile: could not find TB for pc=%p", retaddr); } n = env->icount_decr.u16.low + tb->icount; - cpu_restore_state(tb, env, (unsigned long)retaddr, NULL); + cpu_restore_state(tb, env, (uintptr_t)retaddr, NULL); /* Calculate how many instructions had been executed before the fault occurred. */ n = n - env->icount_decr.u16.low; diff --git a/gen-icount.h b/gen-icount.h index 8879da6..793144d 100644 --- a/gen-icount.h +++ b/gen-icount.h @@ -29,7 +29,7 @@ static void gen_icount_end(TranslationBlock *tb, int num_insns) if (use_icount) { *icount_arg = num_insns; gen_set_label(icount_label); - tcg_gen_exit_tb((long)tb + 2); + tcg_gen_exit_tb((uintptr_t)tb + 2); } } diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c index 9abede7..736ff32 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc405_boards.c @@ -208,7 +208,8 @@ static void ref405ep_init (ram_addr_t ram_size, sram_size = 512 * 1024; sram_offset = qemu_ram_alloc(NULL, "ef405ep.sram", sram_size); #ifdef DEBUG_BOARD_INIT - printf("%s: register SRAM at offset %08lx\n", __func__, sram_offset); + printf("%s: register SRAM at offset %08" PRIxPTR "\n", + __func__, sram_offset); #endif cpu_register_physical_memory(0xFFF00000, sram_size, sram_offset | IO_MEM_RAM); @@ -225,7 +226,7 @@ static void ref405ep_init (ram_addr_t ram_size, fl_sectors = (bios_size + 65535) >> 16; #ifdef DEBUG_BOARD_INIT printf("Register parallel flash %d size %lx" - " at offset %08lx addr %lx '%s' %d\n", + " at offset %08" PRIxPTR " addr %lx '%s' %d\n", fl_idx, bios_size, bios_offset, -bios_size, bdrv_get_device_name(dinfo->bdrv), fl_sectors); #endif @@ -539,7 +540,7 @@ static void taihu_405ep_init(ram_addr_t ram_size, bios_offset = qemu_ram_alloc(NULL, "taihu_405ep.bios", bios_size); #ifdef DEBUG_BOARD_INIT printf("Register parallel flash %d size %lx" - " at offset %08lx addr %lx '%s' %d\n", + " at offset %08" PRIxPTR " addr %lx '%s' %d\n", fl_idx, bios_size, bios_offset, -bios_size, bdrv_get_device_name(dinfo->bdrv), fl_sectors); #endif @@ -581,7 +582,7 @@ static void taihu_405ep_init(ram_addr_t ram_size, fl_sectors = (bios_size + 65535) >> 16; #ifdef DEBUG_BOARD_INIT printf("Register parallel flash %d size %lx" - " at offset %08lx addr " TARGET_FMT_lx " '%s'\n", + " at offset %08" PRIxPTR " addr " TARGET_FMT_lx " '%s'\n", fl_idx, bios_size, bios_offset, (target_ulong)0xfc000000, bdrv_get_device_name(dinfo->bdrv)); #endif diff --git a/migration-tcp.c b/migration-tcp.c index b55f419..e8dff9d 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -139,7 +139,7 @@ static void tcp_accept_incoming_migration(void *opaque) { struct sockaddr_in addr; socklen_t addrlen = sizeof(addr); - int s = (unsigned long)opaque; + int s = (intptr_t)opaque; QEMUFile *f; int c; @@ -194,7 +194,7 @@ int tcp_start_incoming_migration(const char *host_port) goto err; qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL, - (void *)(unsigned long)s); + (void *)(intptr_t)s); return 0; diff --git a/qemu-timer.c b/qemu-timer.c index 658f637..c0d0703 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -982,7 +982,7 @@ static int win32_start_timer(struct qemu_alarm_timer *t) data->timerId = timeSetEvent(1, // interval (ms) data->period, // resolution host_alarm_handler, // function - (DWORD)t, // parameter + (DWORD)(uintptr_t)t, /* parameter */ flags); if (!data->timerId) { @@ -1018,7 +1018,7 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t) data->timerId = timeSetEvent(1, data->period, host_alarm_handler, - (DWORD)t, + (DWORD)(uintptr_t)t, TIME_ONESHOT | TIME_CALLBACK_FUNCTION); if (!data->timerId) { diff --git a/slirp/cksum.c b/slirp/cksum.c index e43867d..3b6d53a 100644 --- a/slirp/cksum.c +++ b/slirp/cksum.c @@ -75,7 +75,7 @@ int cksum(struct mbuf *m, int len) /* * Force to even boundary. */ - if ((1 & (long) w) && (mlen > 0)) { + if ((1 & (uintptr_t)w) && (mlen > 0)) { REDUCE; sum <<= 8; s_util.c[0] = *(uint8_t *)w; diff --git a/softmmu_header.h b/softmmu_header.h index 2f95c33..2e50d59 100644 --- a/softmmu_header.h +++ b/softmmu_header.h @@ -76,7 +76,7 @@ static inline RES_TYPE glue(glue(ld, USUFFIX), MEMSUFFIX)(target_ulong ptr) int page_index; RES_TYPE res; target_ulong addr; - unsigned long physaddr; + uintptr_t physaddr; int mmu_idx; addr = ptr; @@ -97,7 +97,7 @@ static inline int glue(glue(lds, SUFFIX), MEMSUFFIX)(target_ulong ptr) { int res, page_index; target_ulong addr; - unsigned long physaddr; + uintptr_t physaddr; int mmu_idx; addr = ptr; @@ -122,7 +122,7 @@ static inline void glue(glue(st, SUFFIX), MEMSUFFIX)(target_ulong ptr, RES_TYPE { int page_index; target_ulong addr; - unsigned long physaddr; + uintptr_t physaddr; int mmu_idx; addr = ptr; diff --git a/softmmu_template.h b/softmmu_template.h index c2df9ec..933acab 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -59,7 +59,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(target_phys_addr_t physaddr, int index; index = (physaddr >> IO_MEM_SHIFT) & (IO_MEM_NB_ENTRIES - 1); physaddr = (physaddr & TARGET_PAGE_MASK) + addr; - env->mem_io_pc = (unsigned long)retaddr; + env->mem_io_pc = (uintptr_t)retaddr; if (index > (IO_MEM_NOTDIRTY >> IO_MEM_SHIFT) && !can_do_io(env)) { cpu_io_recompile(env, retaddr); @@ -122,7 +122,7 @@ DATA_TYPE REGPARM glue(glue(__ld, SUFFIX), MMUSUFFIX)(target_ulong addr, } #endif addend = env->tlb_table[mmu_idx][index].addend; - res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)(long)(addr+addend)); + res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)(uintptr_t)(addr+addend)); } } else { /* the page is not in the TLB : fill it */ @@ -177,7 +177,7 @@ static DATA_TYPE glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(target_ulong addr, } else { /* unaligned/aligned access in the same page */ addend = env->tlb_table[mmu_idx][index].addend; - res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)(long)(addr+addend)); + res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)(uintptr_t)(addr+addend)); } } else { /* the page is not in the TLB : fill it */ @@ -208,7 +208,7 @@ static inline void glue(io_write, SUFFIX)(target_phys_addr_t physaddr, } env->mem_io_vaddr = addr; - env->mem_io_pc = (unsigned long)retaddr; + env->mem_io_pc = (uintptr_t)retaddr; #if SHIFT <= 2 io_mem_write[index][SHIFT](io_mem_opaque[index], physaddr, val); #else @@ -260,7 +260,7 @@ void REGPARM glue(glue(__st, SUFFIX), MMUSUFFIX)(target_ulong addr, } #endif addend = env->tlb_table[mmu_idx][index].addend; - glue(glue(st, SUFFIX), _raw)((uint8_t *)(long)(addr+addend), val); + glue(glue(st, SUFFIX), _raw)((uint8_t *)(uintptr_t)(addr+addend), val); } } else { /* the page is not in the TLB : fill it */ @@ -312,7 +312,7 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(target_ulong addr, } else { /* aligned/unaligned access in the same page */ addend = env->tlb_table[mmu_idx][index].addend; - glue(glue(st, SUFFIX), _raw)((uint8_t *)(long)(addr+addend), val); + glue(glue(st, SUFFIX), _raw)((uint8_t *)(uintptr_t)(addr+addend), val); } } else { /* the page is not in the TLB : fill it */ diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index 6c2ae20..fb2ce1f 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -1357,7 +1357,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - unsigned long pc; + uintptr_t pc; int ret; /* XXX: hack to restore env in all cases, even if not called from diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 3a1c625..63da6c8 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -398,7 +398,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((long)ctx->tb); + tcg_gen_exit_tb((uintptr_t)ctx->tb); return EXIT_GOTO_TB; } else { tcg_gen_movi_i64(cpu_pc, dest); @@ -417,12 +417,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((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((long)ctx->tb + 1); + tcg_gen_exit_tb((uintptr_t)ctx->tb + 1); return EXIT_GOTO_TB; } else { diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 3de2610..9c1105d 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -74,7 +74,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - unsigned long pc; + uintptr_t pc; int ret; /* XXX: hack to restore env in all cases, even if not called from @@ -85,7 +85,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; + pc = (uintptr_t)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-arm/translate.c b/target-arm/translate.c index e4649e6..c00c0ea 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -3363,7 +3363,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((uintptr_t)tb + n); } else { gen_set_pc_im(dest); tcg_gen_exit_tb(0); diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index be9eb06..5137400 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -58,7 +58,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - unsigned long pc; + uintptr_t pc; int ret; /* XXX: hack to restore env in all cases, even if not called from @@ -72,7 +72,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; + pc = (uintptr_t)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-cris/translate.c b/target-cris/translate.c index b4648a0..06e2a00 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -596,7 +596,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((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/op_helper.c b/target-i386/op_helper.c index 43fbd0c..acc247e 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -4820,7 +4820,7 @@ void tlb_fill(target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; int ret; - unsigned long pc; + uintptr_t pc; CPUX86State *saved_env; /* XXX: hack to restore env in all cases, even if not called from @@ -4832,7 +4832,7 @@ void tlb_fill(target_ulong addr, int is_write, int mmu_idx, void *retaddr) if (ret) { if (retaddr) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; + pc = (uintptr_t)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-i386/translate.c b/target-i386/translate.c index c008450..6390e4e 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -2274,7 +2274,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((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-m68k/op_helper.c b/target-m68k/op_helper.c index 0711107..8d876eb 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -52,7 +52,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - unsigned long pc; + uintptr_t pc; int ret; /* XXX: hack to restore env in all cases, even if not called from @@ -63,7 +63,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; + pc = (uintptr_t)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 6f72a2b..0ecfdb0 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -861,7 +861,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((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/op_helper.c b/target-microblaze/op_helper.c index d75a53c..bb58d49 100644 --- a/target-microblaze/op_helper.c +++ b/target-microblaze/op_helper.c @@ -43,7 +43,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - unsigned long pc; + uintptr_t pc; int ret; /* XXX: hack to restore env in all cases, even if not called from @@ -55,7 +55,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; + pc = (uintptr_t)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index 2207431..a330981 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -146,7 +146,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((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/op_helper.c b/target-mips/op_helper.c index 669faf1..956d1cd 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -50,7 +50,7 @@ void helper_raise_exception (uint32_t exception) static void do_restore_state (void *pc_ptr) { TranslationBlock *tb; - unsigned long pc = (unsigned long) pc_ptr; + uintptr_t pc = (uintptr_t) pc_ptr; tb = tb_find_pc (pc); if (tb) { @@ -1913,7 +1913,7 @@ void helper_pmon (int function) break; case 158: { - unsigned char *fmt = (void *)(unsigned long)env->active_tc.gpr[4]; + unsigned char *fmt = (void *)(uintptr_t)env->active_tc.gpr[4]; printf("%s", fmt); } break; @@ -1956,7 +1956,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - unsigned long pc; + uintptr_t pc; int ret; /* XXX: hack to restore env in all cases, even if not called from @@ -1967,7 +1967,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) if (ret) { if (retaddr) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; + pc = (uintptr_t)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-mips/translate.c b/target-mips/translate.c index 0f93e2a..2fb9f38 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -2686,7 +2686,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((long)tb + n); + tcg_gen_exit_tb((uintptr_t)tb + n); } else { gen_save_pc(dest); if (ctx->singlestep_enabled) { diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index 17e070a..b8b32dc 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -3705,7 +3705,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - unsigned long pc; + uintptr_t pc; int ret; /* XXX: hack to restore env in all cases, even if not called from @@ -3716,7 +3716,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) if (unlikely(ret != 0)) { if (likely(retaddr)) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; + pc = (uintptr_t)retaddr; tb = tb_find_pc(pc); if (likely(tb)) { /* the PC is inside the translated code. It means that we have diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 89413c5..c4befe1 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -3339,7 +3339,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((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-ppc/translate_init.c b/target-ppc/translate_init.c index dfcd949..46d3d62 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9106,12 +9106,12 @@ enum { static inline int is_indirect_opcode (void *handler) { - return ((unsigned long)handler & 0x03) == PPC_INDIRECT; + return ((uintptr_t)handler & 0x03) == PPC_INDIRECT; } static inline opc_handler_t **ind_table(void *handler) { - return (opc_handler_t **)((unsigned long)handler & ~3); + return (opc_handler_t **)((uintptr_t)handler & ~3); } /* Instruction table creation */ @@ -9130,7 +9130,7 @@ static int create_new_table (opc_handler_t **table, unsigned char idx) tmp = malloc(0x20 * sizeof(opc_handler_t)); fill_new_table(tmp, 0x20); - table[idx] = (opc_handler_t *)((unsigned long)tmp | PPC_INDIRECT); + table[idx] = (opc_handler_t *)((uintptr_t)tmp | PPC_INDIRECT); return 0; } diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c index 402df2d..627cdc3 100644 --- a/target-s390x/op_helper.c +++ b/target-s390x/op_helper.c @@ -45,7 +45,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - unsigned long pc; + uintptr_t pc; int ret; /* XXX: hack to restore env in all cases, even if not called from @@ -56,7 +56,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) if (unlikely(ret != 0)) { if (likely(retaddr)) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; + pc = (uintptr_t)retaddr; tb = tb_find_pc(pc); if (likely(tb)) { /* the PC is inside the translated code. It means that we have diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index 30f9842..5f1f4e3 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -24,10 +24,10 @@ static void cpu_restore_state_from_retaddr(void *retaddr) { TranslationBlock *tb; - unsigned long pc; + uintptr_t pc; if (retaddr) { - pc = (unsigned long) retaddr; + pc = (uintptr_t) retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-sh4/translate.c b/target-sh4/translate.c index 58e9b8f..649d0ee 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -302,7 +302,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((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/op_helper.c b/target-sparc/op_helper.c index 854f168..cb2848d 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -4366,16 +4366,16 @@ static void do_unaligned_access(target_ulong addr, int is_write, int is_user, static void cpu_restore_state2(void *retaddr) { TranslationBlock *tb; - unsigned long pc; + uintptr_t pc; if (retaddr) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; + pc = (uintptr_t)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have a virtual CPU fault */ - cpu_restore_state(tb, env, pc, (void *)(long)env->cond); + cpu_restore_state(tb, env, pc, (void *)(uintptr_t)env->cond); } } } diff --git a/target-sparc/translate.c b/target-sparc/translate.c index e26462e..23d832f 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -241,7 +241,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((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/tcg/tcg.c b/tcg/tcg.c index 5dd6a2c..634b134 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -248,8 +248,8 @@ void tcg_prologue_init(TCGContext *s) s->code_buf = code_gen_prologue; s->code_ptr = s->code_buf; tcg_target_qemu_prologue(s); - flush_icache_range((unsigned long)s->code_buf, - (unsigned long)s->code_ptr); + flush_icache_range((uintptr_t)s->code_buf, + (uintptr_t)s->code_ptr); } void tcg_set_frame(TCGContext *s, int reg, @@ -2060,7 +2060,7 @@ static inline int tcg_gen_code_common(TCGContext *s, uint8_t *gen_code_buf, break; case INDEX_op_set_label: tcg_reg_alloc_bb_end(s, s->reserved_regs); - tcg_out_label(s, args[0], (long)s->code_ptr); + tcg_out_label(s, args[0], (uintptr_t)s->code_ptr); break; case INDEX_op_call: dead_iargs = s->op_dead_iargs[op_index]; @@ -2109,8 +2109,8 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf) tcg_gen_code_common(s, gen_code_buf, -1); /* flush instruction cache */ - flush_icache_range((unsigned long)gen_code_buf, - (unsigned long)s->code_ptr); + flush_icache_range((uintptr_t)gen_code_buf, + (uintptr_t)s->code_ptr); return s->code_ptr - gen_code_buf; } diff --git a/translate-all.c b/translate-all.c index efcfb9a..9937d20 100644 --- a/translate-all.c +++ b/translate-all.c @@ -112,12 +112,12 @@ int cpu_gen_code(CPUState *env, TranslationBlock *tb, int *gen_code_size_ptr) /* The cpu state corresponding to 'searched_pc' is restored. */ int cpu_restore_state(TranslationBlock *tb, - CPUState *env, unsigned long searched_pc, + CPUState *env, uintptr_t searched_pc, void *puc) { TCGContext *s = &tcg_ctx; int j; - unsigned long tc_ptr; + uintptr_t tc_ptr; #ifdef CONFIG_PROFILER int64_t ti; #endif @@ -137,7 +137,7 @@ int cpu_restore_state(TranslationBlock *tb, } /* find opc index corresponding to search_pc */ - tc_ptr = (unsigned long)tb->tc_ptr; + tc_ptr = (uintptr_t)tb->tc_ptr; if (searched_pc < tc_ptr) return -1; -- 1.7.0.4