gwj / at91sam9263 · Commits

Commit 93220573844045c48eeda03df74db04418456ce3

Authored by aurel32
1 parent 94fa46e2

target-ppc: remove remaining warnings 

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5991 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 4 changed files with 11 additions and 17 deletions
target-ppc/cpu.h
  View file @9322057
... ... @@ -678,13 +678,18 @@ void cpu_ppc_close (CPUPPCState *s);
678 678 is returned if the signal was handled by the virtual CPU. */
679 679 int cpu_ppc_signal_handler (int host_signum, void *pinfo,
680 680 void *puc);
681   -
  681 +int cpu_ppc_handle_mmu_fault (CPUPPCState *env, target_ulong address, int rw,
  682 + int mmu_idx, int is_softmmu);
  683 +int get_physical_address (CPUPPCState *env, mmu_ctx_t *ctx, target_ulong vaddr,
  684 + int rw, int access_type);
682 685 void do_interrupt (CPUPPCState *env);
683 686 void ppc_hw_interrupt (CPUPPCState *env);
684 687  
685   -void dump_stack (CPUPPCState *env);
  688 +void cpu_dump_rfi (target_ulong RA, target_ulong msr);
686 689  
687 690 #if !defined(CONFIG_USER_ONLY)
  691 +void ppc6xx_tlb_store (CPUPPCState *env, target_ulong EPN, int way, int is_code,
  692 + target_ulong pte0, target_ulong pte1);
688 693 void ppc_store_ibatu (CPUPPCState *env, int nr, target_ulong value);
689 694 void ppc_store_ibatl (CPUPPCState *env, int nr, target_ulong value);
690 695 void ppc_store_dbatu (CPUPPCState *env, int nr, target_ulong value);
... ...
target-ppc/exec.h
  View file @9322057
... ... @@ -38,12 +38,6 @@ register struct CPUPPCState *env asm(AREG0);
38 38 #include "softmmu_exec.h"
39 39 #endif /* !defined(CONFIG_USER_ONLY) */
40 40  
41   -int get_physical_address (CPUState *env, mmu_ctx_t *ctx, target_ulong vaddr,
42   - int rw, int access_type);
43   -
44   -void ppc6xx_tlb_store (CPUState *env, target_ulong EPN, int way, int is_code,
45   - target_ulong pte0, target_ulong pte1);
46   -
47 41 static always_inline void env_to_regs (void)
48 42 {
49 43 }
... ... @@ -52,9 +46,6 @@ static always_inline void regs_to_env (void)
52 46 {
53 47 }
54 48  
55   -int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
56   - int mmu_idx, int is_softmmu);
57   -
58 49 static always_inline int cpu_halted (CPUState *env)
59 50 {
60 51 if (!env->halted)
... ...
target-ppc/helper.c
  View file @9322057
... ... @@ -1205,7 +1205,7 @@ static always_inline void ppc4xx_tlb_invalidate_virt (CPUState *env,
1205 1205 #endif
1206 1206 }
1207 1207  
1208   -int mmu40x_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
  1208 +static int mmu40x_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
1209 1209 target_ulong address, int rw, int access_type)
1210 1210 {
1211 1211 ppcemb_tlb_t *tlb;
... ... @@ -1287,9 +1287,9 @@ void store_40x_sler (CPUPPCState *env, uint32_t val)
1287 1287 env->spr[SPR_405_SLER] = val;
1288 1288 }
1289 1289  
1290   -int mmubooke_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
1291   - target_ulong address, int rw,
1292   - int access_type)
  1290 +static int mmubooke_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
  1291 + target_ulong address, int rw,
  1292 + int access_type)
1293 1293 {
1294 1294 ppcemb_tlb_t *tlb;
1295 1295 target_phys_addr_t raddr;
... ...
target-ppc/op_helper.c
  View file @9322057
... ... @@ -1669,8 +1669,6 @@ void helper_store_msr (target_ulong val)
1669 1669 }
1670 1670 }
1671 1671  
1672   -void cpu_dump_rfi (target_ulong RA, target_ulong msr);
1673   -
1674 1672 static always_inline void do_rfi (target_ulong nip, target_ulong msr,
1675 1673 target_ulong msrm, int keep_msrh)
1676 1674 {
... ...