From e96efcfcb19b81d87ed3baec419b14cdd6e021a4 Mon Sep 17 00:00:00 2001 From: j_mayer Date: Sat, 14 Apr 2007 12:17:09 +0000 Subject: Fix miscellaneous display warnings for PowerPC & alpha targets and parallel CFI flash driver. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2661 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-ppc/helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target-ppc/helper.c') diff --git a/target-ppc/helper.c b/target-ppc/helper.c index b9a55b1f2b..a7d0391827 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -38,7 +38,7 @@ /* PowerPC MMU emulation */ #if defined(CONFIG_USER_ONLY) -int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw, +int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw, int is_user, int is_softmmu) { int exception, error_code; @@ -631,7 +631,7 @@ static int get_segment (CPUState *env, mmu_ctx_t *ctx, } int mmu4xx_get_physical_address (CPUState *env, mmu_ctx_t *ctx, - uint32_t address, int rw, int access_type) + target_ulong address, int rw, int access_type) { ppcemb_tlb_t *tlb; target_phys_addr_t raddr; @@ -649,8 +649,8 @@ int mmu4xx_get_physical_address (CPUState *env, mmu_ctx_t *ctx, } mask = ~(tlb->size - 1); if (loglevel) { - fprintf(logfile, "%s: TLB %d address %08x PID %04x <=> " - "%08x %08x %04x\n", + fprintf(logfile, "%s: TLB %d address " ADDRX " PID " ADDRX " <=> " + ADDRX " " ADDRX " " ADDRX "\n", __func__, i, address, env->spr[SPR_40x_PID], tlb->EPN, mask, tlb->PID); } @@ -832,7 +832,7 @@ target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr) } /* Perform address translation */ -int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw, +int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw, int is_user, int is_softmmu) { mmu_ctx_t ctx; -- cgit v1.2.3