Revision a8170e5e softmmu_template.h
b/softmmu_template.h | ||
---|---|---|
59 | 59 |
int mmu_idx, |
60 | 60 |
uintptr_t retaddr); |
61 | 61 |
static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, |
62 |
target_phys_addr_t physaddr,
|
|
62 |
hwaddr physaddr,
|
|
63 | 63 |
target_ulong addr, |
64 | 64 |
uintptr_t retaddr) |
65 | 65 |
{ |
... | ... | |
98 | 98 |
DATA_TYPE res; |
99 | 99 |
int index; |
100 | 100 |
target_ulong tlb_addr; |
101 |
target_phys_addr_t ioaddr;
|
|
101 |
hwaddr ioaddr;
|
|
102 | 102 |
uintptr_t retaddr; |
103 | 103 |
|
104 | 104 |
/* test if there is match for unaligned or IO access */ |
... | ... | |
158 | 158 |
{ |
159 | 159 |
DATA_TYPE res, res1, res2; |
160 | 160 |
int index, shift; |
161 |
target_phys_addr_t ioaddr;
|
|
161 |
hwaddr ioaddr;
|
|
162 | 162 |
target_ulong tlb_addr, addr1, addr2; |
163 | 163 |
|
164 | 164 |
index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); |
... | ... | |
210 | 210 |
uintptr_t retaddr); |
211 | 211 |
|
212 | 212 |
static inline void glue(io_write, SUFFIX)(CPUArchState *env, |
213 |
target_phys_addr_t physaddr,
|
|
213 |
hwaddr physaddr,
|
|
214 | 214 |
DATA_TYPE val, |
215 | 215 |
target_ulong addr, |
216 | 216 |
uintptr_t retaddr) |
... | ... | |
244 | 244 |
target_ulong addr, DATA_TYPE val, |
245 | 245 |
int mmu_idx) |
246 | 246 |
{ |
247 |
target_phys_addr_t ioaddr;
|
|
247 |
hwaddr ioaddr;
|
|
248 | 248 |
target_ulong tlb_addr; |
249 | 249 |
uintptr_t retaddr; |
250 | 250 |
int index; |
... | ... | |
300 | 300 |
int mmu_idx, |
301 | 301 |
uintptr_t retaddr) |
302 | 302 |
{ |
303 |
target_phys_addr_t ioaddr;
|
|
303 |
hwaddr ioaddr;
|
|
304 | 304 |
target_ulong tlb_addr; |
305 | 305 |
int index, i; |
306 | 306 |
|
Also available in: Unified diff