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:24 +0100 |
| commit | 0ecb72a58838d8a0d4edcad7db674d39bfd2e9bc (patch) | |
| tree | cc1c416517ff9f67d80a9cae20e8cfefaf354fcb /target-arm/cpu.h | |
| parent | 4d5712f19b464cce8a3fdfad055f3d5833bd0d08 (diff) | |
| download | qemu-0ecb72a58838d8a0d4edcad7db674d39bfd2e9bc.zip qemu-0ecb72a58838d8a0d4edcad7db674d39bfd2e9bc.tar.gz qemu-0ecb72a58838d8a0d4edcad7db674d39bfd2e9bc.tar.bz2 | |
target-arm: Don't overuse CPUState
Scripted conversion:
sed -i "s/CPUState/CPUARMState/g" target-arm/*.[hc]
sed -i "s/#define CPUARMState/#define CPUState/" target-arm/cpu.h
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-arm/cpu.h')
| -rw-r--r-- | target-arm/cpu.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 0d9b39c..2bbb5d1 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -461,13 +461,13 @@ void cpu_arm_set_cp_io(CPUARMState *env, int cpnum, #define MMU_MODE0_SUFFIX _kernel #define MMU_MODE1_SUFFIX _user #define MMU_USER_IDX 1 -static inline int cpu_mmu_index (CPUState *env) +static inline int cpu_mmu_index (CPUARMState *env) { return (env->uncached_cpsr & CPSR_M) == ARM_CPU_MODE_USR ? 1 : 0; } #if defined(CONFIG_USER_ONLY) -static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) +static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp) { if (newsp) env->regs[13] = newsp; @@ -506,7 +506,7 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) #define ARM_TBFLAG_CONDEXEC(F) \ (((F) & ARM_TBFLAG_CONDEXEC_MASK) >> ARM_TBFLAG_CONDEXEC_SHIFT) -static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc, +static inline void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, target_ulong *cs_base, int *flags) { int privmode; @@ -529,7 +529,7 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc, } } -static inline bool cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUARMState *env) { return env->interrupt_request & (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB); @@ -537,7 +537,7 @@ static inline bool cpu_has_work(CPUState *env) #include "exec-all.h" -static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +static inline void cpu_pc_from_tb(CPUARMState *env, TranslationBlock *tb) { env->regs[15] = tb->pc; } |