diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2003-07-09 17:16:27 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2003-07-09 17:16:27 +0000 |
| commit | 1b21b62ab4b68da17b18f630e33ff7e1d5e3d3a2 (patch) | |
| tree | ceffbbd6343b56cff9ccc8a93cf1e7efc4090bd2 /cpu-exec.c | |
| parent | a1516e92b6ed887ef27f3a33a27a9acd772a5de4 (diff) | |
ARM fixes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@317 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index ddbeb2ce90..ef33aaa3e0 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -225,7 +225,9 @@ int cpu_exec(CPUState *env1) 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); #elif defined(TARGET_ARM) + env->cpsr = compute_cpsr(); cpu_arm_dump_state(env, logfile, 0); + env->cpsr &= ~0xf0000000; #else #error unsupported target CPU #endif @@ -306,7 +308,7 @@ int cpu_exec(CPUState *env1) T0 = tmp_T0; #endif /* see if we can patch the calling TB. XXX: remove TF test */ - if (T0 != 0 + if (T0 != 0 #if defined(TARGET_I386) && !(env->eflags & TF_MASK) #endif @@ -372,12 +374,7 @@ int cpu_exec(CPUState *env1) EDI = saved_EDI; #endif #elif defined(TARGET_ARM) - { - int ZF; - ZF = (env->NZF == 0); - env->cpsr = env->cpsr | (env->NZF & 0x80000000) | (ZF << 30) | - (env->CF << 29) | ((env->VF & 0x80000000) >> 3); - } + env->cpsr = compute_cpsr(); #else #error unsupported target CPU #endif |