Commit 2fa73ec8186db632369b68758c22ae9a01f841dd
1 parent
ef28c4b0
CRIS: cris_mmu_result_t -> cris_mmu_result
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Showing
3 changed files
with
6 additions
and
6 deletions
target-cris/helper.c
| ... | ... | @@ -77,7 +77,7 @@ static void cris_shift_ccs(CPUState *env) |
| 77 | 77 | int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw, |
| 78 | 78 | int mmu_idx, int is_softmmu) |
| 79 | 79 | { |
| 80 | - struct cris_mmu_result_t res; | |
| 80 | + struct cris_mmu_result res; | |
| 81 | 81 | int prot, miss; |
| 82 | 82 | int r = -1; |
| 83 | 83 | target_ulong phy; |
| ... | ... | @@ -191,7 +191,7 @@ void do_interrupt(CPUState *env) |
| 191 | 191 | target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr) |
| 192 | 192 | { |
| 193 | 193 | uint32_t phy = addr; |
| 194 | - struct cris_mmu_result_t res; | |
| 194 | + struct cris_mmu_result res; | |
| 195 | 195 | int miss; |
| 196 | 196 | miss = cris_mmu_translate(&res, env, addr, 0, 0); |
| 197 | 197 | if (!miss) | ... | ... |
target-cris/mmu.c
| ... | ... | @@ -123,7 +123,7 @@ static void dump_tlb(CPUState *env, int mmu) |
| 123 | 123 | #endif |
| 124 | 124 | |
| 125 | 125 | /* rw 0 = read, 1 = write, 2 = exec. */ |
| 126 | -static int cris_mmu_translate_page(struct cris_mmu_result_t *res, | |
| 126 | +static int cris_mmu_translate_page(struct cris_mmu_result *res, | |
| 127 | 127 | CPUState *env, uint32_t vaddr, |
| 128 | 128 | int rw, int usermode) |
| 129 | 129 | { |
| ... | ... | @@ -324,7 +324,7 @@ void cris_mmu_flush_pid(CPUState *env, uint32_t pid) |
| 324 | 324 | } |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | -int cris_mmu_translate(struct cris_mmu_result_t *res, | |
| 327 | +int cris_mmu_translate(struct cris_mmu_result *res, | |
| 328 | 328 | CPUState *env, uint32_t vaddr, |
| 329 | 329 | int rw, int mmu_idx) |
| 330 | 330 | { | ... | ... |
target-cris/mmu.h
| ... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | #define CRIS_MMU_ERR_WRITE 2 |
| 4 | 4 | #define CRIS_MMU_ERR_FLUSH 3 |
| 5 | 5 | |
| 6 | -struct cris_mmu_result_t | |
| 6 | +struct cris_mmu_result | |
| 7 | 7 | { |
| 8 | 8 | uint32_t phy; |
| 9 | 9 | int prot; |
| ... | ... | @@ -12,6 +12,6 @@ struct cris_mmu_result_t |
| 12 | 12 | |
| 13 | 13 | void cris_mmu_init(CPUState *env); |
| 14 | 14 | void cris_mmu_flush_pid(CPUState *env, uint32_t pid); |
| 15 | -int cris_mmu_translate(struct cris_mmu_result_t *res, | |
| 15 | +int cris_mmu_translate(struct cris_mmu_result *res, | |
| 16 | 16 | CPUState *env, uint32_t vaddr, |
| 17 | 17 | int rw, int mmu_idx); | ... | ... |