diff options
Diffstat (limited to 'cpu-common.h')
| -rw-r--r-- | cpu-common.h | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/cpu-common.h b/cpu-common.h index 854f629ad4..630237203d 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -10,69 +10,69 @@ #include "bswap.h" /* address in the RAM (different from a physical address) */ -typedef unsigned long a_ram_addr; +typedef unsigned long ram_addr_t; /* memory API */ -typedef void CPUWriteMemoryFunc(void *opaque, a_target_phys_addr addr, uint32_t value); -typedef uint32_t CPUReadMemoryFunc(void *opaque, a_target_phys_addr addr); +typedef void CPUWriteMemoryFunc(void *opaque, target_phys_addr_t addr, uint32_t value); +typedef uint32_t CPUReadMemoryFunc(void *opaque, target_phys_addr_t addr); -void cpu_register_physical_memory_offset(a_target_phys_addr start_addr, - a_ram_addr size, - a_ram_addr phys_offset, - a_ram_addr region_offset); -static inline void cpu_register_physical_memory(a_target_phys_addr start_addr, - a_ram_addr size, - a_ram_addr phys_offset) +void cpu_register_physical_memory_offset(target_phys_addr_t start_addr, + ram_addr_t size, + ram_addr_t phys_offset, + ram_addr_t region_offset); +static inline void cpu_register_physical_memory(target_phys_addr_t start_addr, + ram_addr_t size, + ram_addr_t phys_offset) { cpu_register_physical_memory_offset(start_addr, size, phys_offset, 0); } -a_ram_addr cpu_get_physical_page_desc(a_target_phys_addr addr); -a_ram_addr qemu_ram_alloc(a_ram_addr); -void qemu_ram_free(a_ram_addr addr); +ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr); +ram_addr_t qemu_ram_alloc(ram_addr_t); +void qemu_ram_free(ram_addr_t addr); /* This should only be used for ram local to a device. */ -void *qemu_get_ram_ptr(a_ram_addr addr); +void *qemu_get_ram_ptr(ram_addr_t addr); /* This should not be used by devices. */ -a_ram_addr qemu_ram_addr_from_host(void *ptr); +ram_addr_t qemu_ram_addr_from_host(void *ptr); int cpu_register_io_memory(CPUReadMemoryFunc * const *mem_read, CPUWriteMemoryFunc * const *mem_write, void *opaque); void cpu_unregister_io_memory(int table_address); -void cpu_physical_memory_rw(a_target_phys_addr addr, uint8_t *buf, +void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, int len, int is_write); -static inline void cpu_physical_memory_read(a_target_phys_addr addr, +static inline void cpu_physical_memory_read(target_phys_addr_t addr, uint8_t *buf, int len) { cpu_physical_memory_rw(addr, buf, len, 0); } -static inline void cpu_physical_memory_write(a_target_phys_addr addr, +static inline void cpu_physical_memory_write(target_phys_addr_t addr, const uint8_t *buf, int len) { cpu_physical_memory_rw(addr, (uint8_t *)buf, len, 1); } -void *cpu_physical_memory_map(a_target_phys_addr addr, - a_target_phys_addr *plen, +void *cpu_physical_memory_map(target_phys_addr_t addr, + target_phys_addr_t *plen, int is_write); -void cpu_physical_memory_unmap(void *buffer, a_target_phys_addr len, - int is_write, a_target_phys_addr access_len); +void cpu_physical_memory_unmap(void *buffer, target_phys_addr_t len, + int is_write, target_phys_addr_t access_len); void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque)); void cpu_unregister_map_client(void *cookie); -uint32_t ldub_phys(a_target_phys_addr addr); -uint32_t lduw_phys(a_target_phys_addr addr); -uint32_t ldl_phys(a_target_phys_addr addr); -uint64_t ldq_phys(a_target_phys_addr addr); -void stl_phys_notdirty(a_target_phys_addr addr, uint32_t val); -void stq_phys_notdirty(a_target_phys_addr addr, uint64_t val); -void stb_phys(a_target_phys_addr addr, uint32_t val); -void stw_phys(a_target_phys_addr addr, uint32_t val); -void stl_phys(a_target_phys_addr addr, uint32_t val); -void stq_phys(a_target_phys_addr addr, uint64_t val); - -void cpu_physical_memory_write_rom(a_target_phys_addr addr, +uint32_t ldub_phys(target_phys_addr_t addr); +uint32_t lduw_phys(target_phys_addr_t addr); +uint32_t ldl_phys(target_phys_addr_t addr); +uint64_t ldq_phys(target_phys_addr_t addr); +void stl_phys_notdirty(target_phys_addr_t addr, uint32_t val); +void stq_phys_notdirty(target_phys_addr_t addr, uint64_t val); +void stb_phys(target_phys_addr_t addr, uint32_t val); +void stw_phys(target_phys_addr_t addr, uint32_t val); +void stl_phys(target_phys_addr_t addr, uint32_t val); +void stq_phys(target_phys_addr_t addr, uint64_t val); + +void cpu_physical_memory_write_rom(target_phys_addr_t addr, const uint8_t *buf, int len); #define IO_MEM_SHIFT 3 |