mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 23:03:54 -06:00
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>
This commit is contained in:
parent
50d2b4d93f
commit
a8170e5e97
383 changed files with 2240 additions and 2240 deletions
|
@ -279,11 +279,11 @@ typedef struct CPUOpenRISCTLBContext {
|
|||
OpenRISCTLBEntry dtlb[DTLB_WAYS][DTLB_SIZE];
|
||||
|
||||
int (*cpu_openrisc_map_address_code)(struct OpenRISCCPU *cpu,
|
||||
target_phys_addr_t *physical,
|
||||
hwaddr *physical,
|
||||
int *prot,
|
||||
target_ulong address, int rw);
|
||||
int (*cpu_openrisc_map_address_data)(struct OpenRISCCPU *cpu,
|
||||
target_phys_addr_t *physical,
|
||||
hwaddr *physical,
|
||||
int *prot,
|
||||
target_ulong address, int rw);
|
||||
} CPUOpenRISCTLBContext;
|
||||
|
@ -387,13 +387,13 @@ void cpu_openrisc_count_stop(OpenRISCCPU *cpu);
|
|||
|
||||
void cpu_openrisc_mmu_init(OpenRISCCPU *cpu);
|
||||
int cpu_openrisc_get_phys_nommu(OpenRISCCPU *cpu,
|
||||
target_phys_addr_t *physical,
|
||||
hwaddr *physical,
|
||||
int *prot, target_ulong address, int rw);
|
||||
int cpu_openrisc_get_phys_code(OpenRISCCPU *cpu,
|
||||
target_phys_addr_t *physical,
|
||||
hwaddr *physical,
|
||||
int *prot, target_ulong address, int rw);
|
||||
int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu,
|
||||
target_phys_addr_t *physical,
|
||||
hwaddr *physical,
|
||||
int *prot, target_ulong address, int rw);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
int cpu_openrisc_get_phys_nommu(OpenRISCCPU *cpu,
|
||||
target_phys_addr_t *physical,
|
||||
hwaddr *physical,
|
||||
int *prot, target_ulong address, int rw)
|
||||
{
|
||||
*physical = address;
|
||||
|
@ -37,7 +37,7 @@ int cpu_openrisc_get_phys_nommu(OpenRISCCPU *cpu,
|
|||
}
|
||||
|
||||
int cpu_openrisc_get_phys_code(OpenRISCCPU *cpu,
|
||||
target_phys_addr_t *physical,
|
||||
hwaddr *physical,
|
||||
int *prot, target_ulong address, int rw)
|
||||
{
|
||||
int vpn = address >> TARGET_PAGE_BITS;
|
||||
|
@ -72,7 +72,7 @@ int cpu_openrisc_get_phys_code(OpenRISCCPU *cpu,
|
|||
}
|
||||
|
||||
int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu,
|
||||
target_phys_addr_t *physical,
|
||||
hwaddr *physical,
|
||||
int *prot, target_ulong address, int rw)
|
||||
{
|
||||
int vpn = address >> TARGET_PAGE_BITS;
|
||||
|
@ -116,7 +116,7 @@ int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu,
|
|||
}
|
||||
|
||||
static int cpu_openrisc_get_phys_addr(OpenRISCCPU *cpu,
|
||||
target_phys_addr_t *physical,
|
||||
hwaddr *physical,
|
||||
int *prot, target_ulong address,
|
||||
int rw)
|
||||
{
|
||||
|
@ -185,7 +185,7 @@ int cpu_openrisc_handle_mmu_fault(CPUOpenRISCState *env,
|
|||
target_ulong address, int rw, int mmu_idx)
|
||||
{
|
||||
int ret = 0;
|
||||
target_phys_addr_t physical = 0;
|
||||
hwaddr physical = 0;
|
||||
int prot = 0;
|
||||
OpenRISCCPU *cpu = OPENRISC_CPU(ENV_GET_CPU(env));
|
||||
|
||||
|
@ -219,10 +219,10 @@ int cpu_openrisc_handle_mmu_fault(CPUOpenRISCState *env,
|
|||
#endif
|
||||
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
target_phys_addr_t cpu_get_phys_page_debug(CPUOpenRISCState *env,
|
||||
hwaddr cpu_get_phys_page_debug(CPUOpenRISCState *env,
|
||||
target_ulong addr)
|
||||
{
|
||||
target_phys_addr_t phys_addr;
|
||||
hwaddr phys_addr;
|
||||
int prot;
|
||||
OpenRISCCPU *cpu = OPENRISC_CPU(ENV_GET_CPU(env));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue