diff options
| author | Avi Kivity <avi@redhat.com> | 2012-10-23 12:30:10 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-23 08:58:25 -0500 |
| commit | a8170e5e97ad17ca169c64ba87ae2f53850dab4c (patch) | |
| tree | 51182ed444f0d2bf282f6bdacef43f32e5adaadf /target-microblaze | |
| parent | 50d2b4d93f45a425f15ac88bc4ec352f5c6e0bc2 (diff) | |
| download | qemu-a8170e5e97ad17ca169c64ba87ae2f53850dab4c.tar.gz | |
Rename target_phys_addr_t to hwaddr
target_phys_addr_t is unwieldly, violates the C standard (_t suffixes are
reserved) and its purpose doesn't match the name (most target_phys_addr_t
addresses are not target specific). Replace it with a finger-friendly,
standards conformant hwaddr.
Outstanding patchsets can be fixed up with the command
git rebase -i --exec 'find -name "*.[ch]"
| xargs s/target_phys_addr_t/hwaddr/g' origin
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-microblaze')
| -rw-r--r-- | target-microblaze/cpu.h | 2 | ||||
| -rw-r--r-- | target-microblaze/helper.c | 2 | ||||
| -rw-r--r-- | target-microblaze/op_helper.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 88430b5057..37bbdf1591 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -370,7 +370,7 @@ static inline void cpu_get_tb_cpu_state(CPUMBState *env, target_ulong *pc, } #if !defined(CONFIG_USER_ONLY) -void cpu_unassigned_access(CPUMBState *env1, target_phys_addr_t addr, +void cpu_unassigned_access(CPUMBState *env1, hwaddr 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 74fce26827..efaa123a14 100644 --- a/target-microblaze/helper.c +++ b/target-microblaze/helper.c @@ -258,7 +258,7 @@ void do_interrupt(CPUMBState *env) } } -target_phys_addr_t cpu_get_phys_page_debug(CPUMBState * env, target_ulong addr) +hwaddr cpu_get_phys_page_debug(CPUMBState * 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 c9789f44c7..210296b30b 100644 --- a/target-microblaze/op_helper.c +++ b/target-microblaze/op_helper.c @@ -501,7 +501,7 @@ void helper_mmu_write(CPUMBState *env, uint32_t rn, uint32_t v) mmu_write(env, rn, v); } -void cpu_unassigned_access(CPUMBState *env, target_phys_addr_t addr, +void cpu_unassigned_access(CPUMBState *env, hwaddr addr, int is_write, int is_exec, int is_asi, int size) { qemu_log_mask(CPU_LOG_INT, "Unassigned " TARGET_FMT_plx " wr=%d exe=%d\n", |