diff options
| author | liguang <lig.fnst@cn.fujitsu.com> | 2013-05-28 16:21:08 +0800 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-06-15 17:50:21 +0000 |
| commit | 80cf2c81a1be732cf1ce4a810ddc7721714d684e (patch) | |
| tree | fb7dafd0d88b49f1d0cfde3cacfbb34107f0b0bf | |
| parent | a78d0eabd4ca05789a9604fe632b9399bf378fee (diff) | |
target-i386/helper: remove DF macro
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | cpu-exec.c | 4 | ||||
| -rw-r--r-- | target-i386/cc_helper.c | 2 | ||||
| -rw-r--r-- | target-i386/cpu.h | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 31c089dac0..ec46380435 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -230,7 +230,7 @@ int cpu_exec(CPUArchState *env) #if defined(TARGET_I386) /* put eflags in CPU temporary format */ CC_SRC = env->eflags & (CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); - DF = 1 - (2 * ((env->eflags >> 10) & 1)); + env->df = 1 - (2 * ((env->eflags >> 10) & 1)); CC_OP = CC_OP_EFLAGS; env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); #elif defined(TARGET_SPARC) @@ -681,7 +681,7 @@ int cpu_exec(CPUArchState *env) #if defined(TARGET_I386) /* restore flags in standard format */ env->eflags = env->eflags | cpu_cc_compute_all(env, CC_OP) - | (DF & DF_MASK); + | (env->df & DF_MASK); #elif defined(TARGET_ARM) /* XXX: Save/restore host fpu exception state?. */ #elif defined(TARGET_UNICORE32) diff --git a/target-i386/cc_helper.c b/target-i386/cc_helper.c index 9daa1a06b8..ee04092b4e 100644 --- a/target-i386/cc_helper.c +++ b/target-i386/cc_helper.c @@ -331,7 +331,7 @@ target_ulong helper_read_eflags(CPUX86State *env) uint32_t eflags; eflags = cpu_cc_compute_all(env, CC_OP); - eflags |= (DF & DF_MASK); + eflags |= (env->df & DF_MASK); eflags |= env->eflags & ~(VM_MASK | RF_MASK); return eflags; } diff --git a/target-i386/cpu.h b/target-i386/cpu.h index b909f73daa..62e3547310 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1101,8 +1101,6 @@ static inline int cpu_mmu_index (CPUX86State *env) ? MMU_KSMAP_IDX : MMU_KERNEL_IDX; } -#define DF (env->df) - #define CC_DST (env->cc_dst) #define CC_SRC (env->cc_src) #define CC_SRC2 (env->cc_src2) @@ -1196,7 +1194,7 @@ uint32_t cpu_cc_compute_all(CPUX86State *env1, int op); static inline uint32_t cpu_compute_eflags(CPUX86State *env) { - return env->eflags | cpu_cc_compute_all(env, CC_OP) | (DF & DF_MASK); + return env->eflags | cpu_cc_compute_all(env, CC_OP) | (env->df & DF_MASK); } /* NOTE: CC_OP must be modified manually to CC_OP_EFLAGS */ @@ -1204,7 +1202,7 @@ static inline void cpu_load_eflags(CPUX86State *env, int eflags, int update_mask) { CC_SRC = eflags & (CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); - DF = 1 - (2 * ((eflags >> 10) & 1)); + env->df = 1 - (2 * ((eflags >> 10) & 1)); env->eflags = (env->eflags & ~update_mask) | (eflags & update_mask) | 0x2; } |