diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-04-25 15:26:25 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-04-25 15:26:25 +0000 |
| commit | 48e77a3653916860a4748e984b99e0f59c820e57 (patch) | |
| tree | d7ce946d5ee15c8af12c70a4203707a4845b7fe8 | |
| parent | 697a77e6e7357f4ae6c74f06a4fa31701442d79d (diff) | |
| parent | 2fa73ec8186db632369b68758c22ae9a01f841dd (diff) | |
Merge branch 'master' of blueswir1@git.sv.gnu.org:/srv/git/qemu
| -rw-r--r-- | target-cris/helper.c | 4 | ||||
| -rw-r--r-- | target-cris/mmu.c | 4 | ||||
| -rw-r--r-- | target-cris/mmu.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/target-cris/helper.c b/target-cris/helper.c index ae2f8dddb2..405454f50f 100644 --- a/target-cris/helper.c +++ b/target-cris/helper.c @@ -77,7 +77,7 @@ static void cris_shift_ccs(CPUState *env) int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw, int mmu_idx, int is_softmmu) { - struct cris_mmu_result_t res; + struct cris_mmu_result res; int prot, miss; int r = -1; target_ulong phy; @@ -191,7 +191,7 @@ void do_interrupt(CPUState *env) target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr) { uint32_t phy = addr; - struct cris_mmu_result_t res; + struct cris_mmu_result res; int miss; miss = cris_mmu_translate(&res, env, addr, 0, 0); if (!miss) diff --git a/target-cris/mmu.c b/target-cris/mmu.c index 9d7981663b..1f3d483220 100644 --- a/target-cris/mmu.c +++ b/target-cris/mmu.c @@ -123,7 +123,7 @@ static void dump_tlb(CPUState *env, int mmu) #endif /* rw 0 = read, 1 = write, 2 = exec. */ -static int cris_mmu_translate_page(struct cris_mmu_result_t *res, +static int cris_mmu_translate_page(struct cris_mmu_result *res, CPUState *env, uint32_t vaddr, int rw, int usermode) { @@ -324,7 +324,7 @@ void cris_mmu_flush_pid(CPUState *env, uint32_t pid) } } -int cris_mmu_translate(struct cris_mmu_result_t *res, +int cris_mmu_translate(struct cris_mmu_result *res, CPUState *env, uint32_t vaddr, int rw, int mmu_idx) { diff --git a/target-cris/mmu.h b/target-cris/mmu.h index aca531a3ed..d753b3834a 100644 --- a/target-cris/mmu.h +++ b/target-cris/mmu.h @@ -3,7 +3,7 @@ #define CRIS_MMU_ERR_WRITE 2 #define CRIS_MMU_ERR_FLUSH 3 -struct cris_mmu_result_t +struct cris_mmu_result { uint32_t phy; int prot; @@ -12,6 +12,6 @@ struct cris_mmu_result_t void cris_mmu_init(CPUState *env); void cris_mmu_flush_pid(CPUState *env, uint32_t pid); -int cris_mmu_translate(struct cris_mmu_result_t *res, +int cris_mmu_translate(struct cris_mmu_result *res, CPUState *env, uint32_t vaddr, int rw, int mmu_idx); |