From 2050396801ca0c8359364d61eaadece951006057 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Mon, 9 Apr 2012 14:20:20 +0000 Subject: 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 Signed-off-by: Blue Swirl --- target-cris/op_helper.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'target-cris/op_helper.c') diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index c568e2b930..b92c106e10 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -57,28 +57,26 @@ from generated code or from helper.c) */ /* XXX: fix it to restore all registers */ void tlb_fill(CPUCRISState *env1, target_ulong addr, int is_write, int mmu_idx, - void *retaddr) + uintptr_t retaddr) { TranslationBlock *tb; CPUCRISState *saved_env; - unsigned long pc; int ret; saved_env = env; env = env1; - D_LOG("%s pc=%x tpc=%x ra=%x\n", __func__, - env->pc, env->debug1, retaddr); + D_LOG("%s pc=%x tpc=%x ra=%p\n", __func__, + env->pc, env->debug1, (void *)retaddr); ret = cpu_cris_handle_mmu_fault(env, addr, is_write, 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); /* Evaluate flags after retranslation. */ helper_top_evaluate_flags(); -- cgit v1.2.3