diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-03-14 01:38:21 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-03-14 22:20:25 +0100 |
| commit | a1170bfd19cdf4bb405b73fea21c1bc4964e3354 (patch) | |
| tree | 64933ead3db8a4de06b3a8cccda114b4424edf1b /target-cris/mmu.c | |
| parent | 0ecb72a58838d8a0d4edcad7db674d39bfd2e9bc (diff) | |
target-cris: Don't overuse CPUState
Scripted conversion:
sed -i "s/CPUState/CPUCRISState/g" target-cris/*.[hc]
sed -i "s/#define CPUCRISState/#define CPUState/" target-cris/cpu.h
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-cris/mmu.c')
| -rw-r--r-- | target-cris/mmu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target-cris/mmu.c b/target-cris/mmu.c index 5cd8f27528..512e28b481 100644 --- a/target-cris/mmu.c +++ b/target-cris/mmu.c @@ -31,7 +31,7 @@ #define D_LOG(...) do { } while (0) #endif -void cris_mmu_init(CPUState *env) +void cris_mmu_init(CPUCRISState *env) { env->mmu_rand_lfsr = 0xcccc; } @@ -49,7 +49,7 @@ static inline unsigned int compute_polynom(unsigned int sr) return f; } -static void cris_mmu_update_rand_lfsr(CPUState *env) +static void cris_mmu_update_rand_lfsr(CPUCRISState *env) { unsigned int f; @@ -70,7 +70,7 @@ static inline int cris_mmu_segmented_addr(int seg, uint32_t rw_mm_cfg) return (1 << seg) & rw_mm_cfg; } -static uint32_t cris_mmu_translate_seg(CPUState *env, int seg) +static uint32_t cris_mmu_translate_seg(CPUCRISState *env, int seg) { uint32_t base; int i; @@ -106,7 +106,7 @@ static inline void set_field(uint32_t *dst, unsigned int val, } #ifdef DEBUG -static void dump_tlb(CPUState *env, int mmu) +static void dump_tlb(CPUCRISState *env, int mmu) { int set; int idx; @@ -128,7 +128,7 @@ static void dump_tlb(CPUState *env, int mmu) /* rw 0 = read, 1 = write, 2 = exec. */ static int cris_mmu_translate_page(struct cris_mmu_result *res, - CPUState *env, uint32_t vaddr, + CPUCRISState *env, uint32_t vaddr, int rw, int usermode, int debug) { unsigned int vpage; @@ -288,7 +288,7 @@ static int cris_mmu_translate_page(struct cris_mmu_result *res, return !match; } -void cris_mmu_flush_pid(CPUState *env, uint32_t pid) +void cris_mmu_flush_pid(CPUCRISState *env, uint32_t pid) { target_ulong vaddr; unsigned int idx; @@ -323,7 +323,7 @@ void cris_mmu_flush_pid(CPUState *env, uint32_t pid) } int cris_mmu_translate(struct cris_mmu_result *res, - CPUState *env, uint32_t vaddr, + CPUCRISState *env, uint32_t vaddr, int rw, int mmu_idx, int debug) { int seg; |