[Qemu-devel] [5991] target-ppc: remove remaining warnings

[Aurelien Jarno]

Revision: 5991
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5991
Author:   aurel32
Date:     2008-12-11 22:42:33 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
target-ppc: remove remaining warnings

Signed-off-by: Aurelien Jarno <address@hidden>

Modified Paths:
--------------
    trunk/target-ppc/cpu.h
    trunk/target-ppc/exec.h
    trunk/target-ppc/helper.c
    trunk/target-ppc/op_helper.c

Modified: trunk/target-ppc/cpu.h
===================================================================
--- trunk/target-ppc/cpu.h      2008-12-11 22:42:25 UTC (rev 5990)
+++ trunk/target-ppc/cpu.h      2008-12-11 22:42:33 UTC (rev 5991)
@@ -678,13 +678,18 @@
    is returned if the signal was handled by the virtual CPU.  */
 int cpu_ppc_signal_handler (int host_signum, void *pinfo,
                             void *puc);
-
+int cpu_ppc_handle_mmu_fault (CPUPPCState *env, target_ulong address, int rw,
+                              int mmu_idx, int is_softmmu);
+int get_physical_address (CPUPPCState *env, mmu_ctx_t *ctx, target_ulong vaddr,
+                          int rw, int access_type);
 void do_interrupt (CPUPPCState *env);
 void ppc_hw_interrupt (CPUPPCState *env);
 
-void dump_stack (CPUPPCState *env);
+void cpu_dump_rfi (target_ulong RA, target_ulong msr);
 
 #if !defined(CONFIG_USER_ONLY)
+void ppc6xx_tlb_store (CPUPPCState *env, target_ulong EPN, int way, int 
is_code,
+                       target_ulong pte0, target_ulong pte1);
 void ppc_store_ibatu (CPUPPCState *env, int nr, target_ulong value);
 void ppc_store_ibatl (CPUPPCState *env, int nr, target_ulong value);
 void ppc_store_dbatu (CPUPPCState *env, int nr, target_ulong value);

Modified: trunk/target-ppc/exec.h
===================================================================
--- trunk/target-ppc/exec.h     2008-12-11 22:42:25 UTC (rev 5990)
+++ trunk/target-ppc/exec.h     2008-12-11 22:42:33 UTC (rev 5991)
@@ -38,12 +38,6 @@
 #include "softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
-int get_physical_address (CPUState *env, mmu_ctx_t *ctx, target_ulong vaddr,
-                          int rw, int access_type);
-
-void ppc6xx_tlb_store (CPUState *env, target_ulong EPN, int way, int is_code,
-                       target_ulong pte0, target_ulong pte1);
-
 static always_inline void env_to_regs (void)
 {
 }
@@ -52,9 +46,6 @@
 {
 }
 
-int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
-                              int mmu_idx, int is_softmmu);
-
 static always_inline int cpu_halted (CPUState *env)
 {
     if (!env->halted)

Modified: trunk/target-ppc/helper.c
===================================================================
--- trunk/target-ppc/helper.c   2008-12-11 22:42:25 UTC (rev 5990)
+++ trunk/target-ppc/helper.c   2008-12-11 22:42:33 UTC (rev 5991)
@@ -1205,7 +1205,7 @@
 #endif
 }
 
-int mmu40x_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
+static int mmu40x_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
                                  target_ulong address, int rw, int access_type)
 {
     ppcemb_tlb_t *tlb;
@@ -1287,9 +1287,9 @@
     env->spr[SPR_405_SLER] = val;
 }
 
-int mmubooke_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
-                                   target_ulong address, int rw,
-                                   int access_type)
+static int mmubooke_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
+                                          target_ulong address, int rw,
+                                          int access_type)
 {
     ppcemb_tlb_t *tlb;
     target_phys_addr_t raddr;

Modified: trunk/target-ppc/op_helper.c
===================================================================
--- trunk/target-ppc/op_helper.c        2008-12-11 22:42:25 UTC (rev 5990)
+++ trunk/target-ppc/op_helper.c        2008-12-11 22:42:33 UTC (rev 5991)
@@ -1669,8 +1669,6 @@
     }
 }
 
-void cpu_dump_rfi (target_ulong RA, target_ulong msr);
-
 static always_inline void do_rfi (target_ulong nip, target_ulong msr,
                                     target_ulong msrm, int keep_msrh)
 {