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/helper.c | |
| parent | 0ecb72a58838d8a0d4edcad7db674d39bfd2e9bc (diff) | |
| download | qemu-a1170bfd19cdf4bb405b73fea21c1bc4964e3354.tar.gz | |
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/helper.c')
| -rw-r--r-- | target-cris/helper.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target-cris/helper.c b/target-cris/helper.c index dd7f18e7f4..8680f436a0 100644 --- a/target-cris/helper.c +++ b/target-cris/helper.c @@ -36,13 +36,13 @@ #if defined(CONFIG_USER_ONLY) -void do_interrupt (CPUState *env) +void do_interrupt (CPUCRISState *env) { env->exception_index = -1; env->pregs[PR_ERP] = env->pc; } -int cpu_cris_handle_mmu_fault(CPUState * env, target_ulong address, int rw, +int cpu_cris_handle_mmu_fault(CPUCRISState * env, target_ulong address, int rw, int mmu_idx) { env->exception_index = 0xaa; @@ -54,7 +54,7 @@ int cpu_cris_handle_mmu_fault(CPUState * env, target_ulong address, int rw, #else /* !CONFIG_USER_ONLY */ -static void cris_shift_ccs(CPUState *env) +static void cris_shift_ccs(CPUCRISState *env) { uint32_t ccs; /* Apply the ccs shift. */ @@ -63,7 +63,7 @@ static void cris_shift_ccs(CPUState *env) env->pregs[PR_CCS] = ccs; } -int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw, +int cpu_cris_handle_mmu_fault (CPUCRISState *env, target_ulong address, int rw, int mmu_idx) { struct cris_mmu_result res; @@ -106,7 +106,7 @@ int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw, return r; } -static void do_interruptv10(CPUState *env) +static void do_interruptv10(CPUCRISState *env) { int ex_vec = -1; @@ -162,7 +162,7 @@ static void do_interruptv10(CPUState *env) env->pregs[PR_ERP]); } -void do_interrupt(CPUState *env) +void do_interrupt(CPUCRISState *env) { int ex_vec = -1; @@ -246,7 +246,7 @@ void do_interrupt(CPUState *env) env->pregs[PR_ERP]); } -target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr) +target_phys_addr_t cpu_get_phys_page_debug(CPUCRISState * env, target_ulong addr) { uint32_t phy = addr; struct cris_mmu_result res; |