diff options
| -rw-r--r-- | target-ppc/cpu.h | 9 | ||||
| -rw-r--r-- | target-ppc/exec.h | 9 | ||||
| -rw-r--r-- | target-ppc/helper.c | 8 | ||||
| -rw-r--r-- | target-ppc/op_helper.c | 2 |
4 files changed, 11 insertions, 17 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 6abd104b24..de53675a09 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -678,13 +678,18 @@ void cpu_ppc_close (CPUPPCState *s); 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); diff --git a/target-ppc/exec.h b/target-ppc/exec.h index 96f75218ba..e9c7e65fc0 100644 --- a/target-ppc/exec.h +++ b/target-ppc/exec.h @@ -38,12 +38,6 @@ register struct CPUPPCState *env asm(AREG0); #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 @@ static always_inline void regs_to_env (void) { } -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) diff --git a/target-ppc/helper.c b/target-ppc/helper.c index bb13195a72..538d9f34c4 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -1205,7 +1205,7 @@ static always_inline void ppc4xx_tlb_invalidate_virt (CPUState *env, #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 @@ void store_40x_sler (CPUPPCState *env, uint32_t val) 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; diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index e43865f77c..0a084bf801 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -1669,8 +1669,6 @@ void helper_store_msr (target_ulong val) } } -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) { |