ARM fixes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@317 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
a1516e92b6
commit
1b21b62ab4
|
@ -225,7 +225,9 @@ int cpu_exec(CPUState *env1)
|
||||||
cpu_x86_dump_state(env, logfile, X86_DUMP_CCOP);
|
cpu_x86_dump_state(env, logfile, X86_DUMP_CCOP);
|
||||||
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_ARM)
|
#elif defined(TARGET_ARM)
|
||||||
|
env->cpsr = compute_cpsr();
|
||||||
cpu_arm_dump_state(env, logfile, 0);
|
cpu_arm_dump_state(env, logfile, 0);
|
||||||
|
env->cpsr &= ~0xf0000000;
|
||||||
#else
|
#else
|
||||||
#error unsupported target CPU
|
#error unsupported target CPU
|
||||||
#endif
|
#endif
|
||||||
|
@ -372,12 +374,7 @@ int cpu_exec(CPUState *env1)
|
||||||
EDI = saved_EDI;
|
EDI = saved_EDI;
|
||||||
#endif
|
#endif
|
||||||
#elif defined(TARGET_ARM)
|
#elif defined(TARGET_ARM)
|
||||||
{
|
env->cpsr = compute_cpsr();
|
||||||
int ZF;
|
|
||||||
ZF = (env->NZF == 0);
|
|
||||||
env->cpsr = env->cpsr | (env->NZF & 0x80000000) | (ZF << 30) |
|
|
||||||
(env->CF << 29) | ((env->VF & 0x80000000) >> 3);
|
|
||||||
}
|
|
||||||
#else
|
#else
|
||||||
#error unsupported target CPU
|
#error unsupported target CPU
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue