diff options
| author | Blue Swirl | 2012-04-09 16:20:20 +0200 |
|---|---|---|
| committer | Blue Swirl | 2012-04-14 16:23:37 +0200 |
| commit | 2050396801ca0c8359364d61eaadece951006057 (patch) | |
| tree | 285b268127f2132bdd5137b80895fa92362116d5 /target-m68k | |
| parent | coroutine-gthread.c: Avoid threading APIs deprecated in GLib 2.31 (diff) | |
| download | qemu-2050396801ca0c8359364d61eaadece951006057.tar.gz qemu-2050396801ca0c8359364d61eaadece951006057.tar.xz qemu-2050396801ca0c8359364d61eaadece951006057.zip | |
Use uintptr_t for various op related functions
Use uintptr_t instead of void * or unsigned long in
several op related functions, env->mem_io_pc and
GETPC() macro.
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-m68k')
| -rw-r--r-- | target-m68k/op_helper.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index bc8c1f02c6..1971a57892 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -56,11 +56,10 @@ extern int semihosting_enabled; from generated code or from helper.c) */ /* XXX: fix it to restore all registers */ void tlb_fill(CPUM68KState *env1, target_ulong addr, int is_write, int mmu_idx, - void *retaddr) + uintptr_t retaddr) { TranslationBlock *tb; CPUM68KState *saved_env; - unsigned long pc; int ret; saved_env = env; @@ -69,12 +68,11 @@ void tlb_fill(CPUM68KState *env1, target_ulong addr, int is_write, int mmu_idx, if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ - pc = (unsigned long)retaddr; - tb = tb_find_pc(pc); + tb = tb_find_pc(retaddr); if (tb) { /* the PC is inside the translated code. It means that we have a virtual CPU fault */ - cpu_restore_state(tb, env, pc); + cpu_restore_state(tb, env, retaddr); } } cpu_loop_exit(env); |