ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
liguang 2013-05-28 16:21:08 +08:00 committed by Blue Swirl
parent a78d0eabd4
commit 80cf2c81a1
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu-exec.c
View File

@ -230,7 +230,7 @@ int cpu_exec(CPUArchState *env)
#if defined(TARGET_I386) #if defined(TARGET_I386)
/* put eflags in CPU temporary format */ /* put eflags in CPU temporary format */
CC_SRC = env->eflags & (CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); 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; CC_OP = CC_OP_EFLAGS;
env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);
#elif defined(TARGET_SPARC) #elif defined(TARGET_SPARC)
@ -681,7 +681,7 @@ int cpu_exec(CPUArchState *env)
#if defined(TARGET_I386) #if defined(TARGET_I386)
/* restore flags in standard format */ /* restore flags in standard format */
env->eflags = env->eflags | cpu_cc_compute_all(env, CC_OP) env->eflags = env->eflags | cpu_cc_compute_all(env, CC_OP)
| (DF & DF_MASK); | (env->df & DF_MASK);
#elif defined(TARGET_ARM) #elif defined(TARGET_ARM)
/* XXX: Save/restore host fpu exception state?. */ /* XXX: Save/restore host fpu exception state?. */
#elif defined(TARGET_UNICORE32) #elif defined(TARGET_UNICORE32)

2
target-i386/cc_helper.c
View File

@ -331,7 +331,7 @@ target_ulong helper_read_eflags(CPUX86State *env)
uint32_t eflags; uint32_t eflags;
eflags = cpu_cc_compute_all(env, CC_OP); eflags = cpu_cc_compute_all(env, CC_OP);
eflags |= (DF & DF_MASK); eflags |= (env->df & DF_MASK);
eflags |= env->eflags & ~(VM_MASK | RF_MASK); eflags |= env->eflags & ~(VM_MASK | RF_MASK);
return eflags; return eflags;
} }

6
target-i386/cpu.h
View File

@ -1101,8 +1101,6 @@ static inline int cpu_mmu_index (CPUX86State *env)
? MMU_KSMAP_IDX : MMU_KERNEL_IDX; ? MMU_KSMAP_IDX : MMU_KERNEL_IDX;
} }
#define DF (env->df)
#define CC_DST (env->cc_dst) #define CC_DST (env->cc_dst)
#define CC_SRC (env->cc_src) #define CC_SRC (env->cc_src)
#define CC_SRC2 (env->cc_src2) #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) 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 */ /* 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) int update_mask)
{ {
CC_SRC = eflags & (CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); 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) | env->eflags = (env->eflags & ~update_mask) |
(eflags & update_mask) | 0x2; (eflags & update_mask) | 0x2;
} }