diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-03-14 01:38:22 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-03-14 22:20:25 +0100 |
| commit | 2b3e3cfe841d213297c0fd7845952d32e8b229d2 (patch) | |
| tree | 4aa2581fb55425c80b7af345d9dd730ea84a097c /target-m68k/op_helper.c | |
| parent | 6393c08de23548be82d53ad462ed5acad107da1f (diff) | |
| download | qemu-2b3e3cfe841d213297c0fd7845952d32e8b229d2.zip | |
target-m68k: Don't overuse CPUState
Scripted conversion:
sed -i "s/CPUState/CPUM68KState/g" target-m68k/*.[hc]
sed -i "s/#define CPUM68KState/#define CPUState/" target-m68k/cpu.h
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-m68k/op_helper.c')
| -rw-r--r-- | target-m68k/op_helper.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index 2f7fe6bc4e..bc8c1f02c6 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -22,12 +22,12 @@ #if defined(CONFIG_USER_ONLY) -void do_interrupt(CPUState *env1) +void do_interrupt(CPUM68KState *env1) { env1->exception_index = -1; } -void do_interrupt_m68k_hardirq(CPUState *env1) +void do_interrupt_m68k_hardirq(CPUM68KState *env1) { } @@ -55,11 +55,11 @@ extern int semihosting_enabled; NULL, it means that the function was called in C code (i.e. not from generated code or from helper.c) */ /* XXX: fix it to restore all registers */ -void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx, +void tlb_fill(CPUM68KState *env1, target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; - CPUState *saved_env; + CPUM68KState *saved_env; unsigned long pc; int ret; @@ -161,9 +161,9 @@ static void do_interrupt_all(int is_hw) env->pc = ldl_kernel(env->vbr + vector); } -void do_interrupt(CPUState *env1) +void do_interrupt(CPUM68KState *env1) { - CPUState *saved_env; + CPUM68KState *saved_env; saved_env = env; env = env1; @@ -171,9 +171,9 @@ void do_interrupt(CPUState *env1) env = saved_env; } -void do_interrupt_m68k_hardirq(CPUState *env1) +void do_interrupt_m68k_hardirq(CPUM68KState *env1) { - CPUState *saved_env; + CPUM68KState *saved_env; saved_env = env; env = env1; @@ -193,7 +193,7 @@ void HELPER(raise_exception)(uint32_t tt) raise_exception(tt); } -void HELPER(divu)(CPUState *env, uint32_t word) +void HELPER(divu)(CPUM68KState *env, uint32_t word) { uint32_t num; uint32_t den; @@ -223,7 +223,7 @@ void HELPER(divu)(CPUState *env, uint32_t word) env->cc_dest = flags; } -void HELPER(divs)(CPUState *env, uint32_t word) +void HELPER(divs)(CPUM68KState *env, uint32_t word) { int32_t num; int32_t den; |