From c227f0995e1722a1abccc28cadf0664266bd8043 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Thu, 1 Oct 2009 16:12:16 -0500 Subject: Revert "Get rid of _t suffix" In the very least, a change like this requires discussion on the list. The naming convention is goofy and it causes a massive merge problem. Something like this _must_ be presented on the list first so people can provide input and cope with it. This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29. Signed-off-by: Anthony Liguori --- target-microblaze/cpu.h | 2 +- target-microblaze/helper.c | 4 ++-- target-microblaze/op_helper.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target-microblaze') diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index facae2fa1..1bf4875ec 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -324,6 +324,6 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc, *flags = env->iflags & IFLAGS_TB_MASK; } -void do_unassigned_access(a_target_phys_addr addr, int is_write, int is_exec, +void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec, int is_asi, int size); #endif diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c index 0de1b066d..40d27b956 100644 --- a/target-microblaze/helper.c +++ b/target-microblaze/helper.c @@ -45,7 +45,7 @@ int cpu_mb_handle_mmu_fault(CPUState * env, target_ulong address, int rw, return 1; } -a_target_phys_addr cpu_get_phys_page_debug(CPUState * env, target_ulong addr) +target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr) { return addr; } @@ -265,7 +265,7 @@ void do_interrupt(CPUState *env) } } -a_target_phys_addr cpu_get_phys_page_debug(CPUState * env, target_ulong addr) +target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr) { target_ulong vaddr, paddr = 0; struct microblaze_mmu_lookup lu; diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c index 63c5225c9..ee4f62313 100644 --- a/target-microblaze/op_helper.c +++ b/target-microblaze/op_helper.c @@ -238,7 +238,7 @@ void helper_mmu_write(uint32_t rn, uint32_t v) } #endif -void do_unassigned_access(a_target_phys_addr addr, int is_write, int is_exec, +void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec, int is_asi, int size) { CPUState *saved_env; -- cgit v1.2.3-65-gdbad